holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This part of a major fix for the calendar.

Browse Source
This commit is contained in:
skeeter 2002-04-16 15:46:01 +00:00
parent d3887570b2
commit b02081a1ec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.holidaycalc_JP.inc.php
View File

@ -92,12 +92,12 @@ class holidaycalc {
$holidays[$i]['month'] = $holiday['month'];
$holidays[$i]['occurence'] = $holiday['occurence'];
$holidays[$i]['dow'] = $holiday['dow'];
$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year) - $datetime->tz_offset;
$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year);
$holidays[$i]['obervance_rule'] = 0;
}
}
$date = mktime(0,0,0,$holiday['month'],$day,$year) - $datetime->tz_offset;
$date = mktime(0,0,0,$holiday['month'],$day,$year);
return $date;
}

6
calendar/inc/class.holidaycalc_US.inc.php
View File

@ -60,7 +60,7 @@ class holidaycalc {
$holidays[$i]['month'] = $holiday['month'];
$holidays[$i]['occurence'] = $holiday['occurence'];
$holidays[$i]['dow'] = $holiday['dow'];
$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year) - $datetime->tz_offset;
$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year);
$holidays[$i]['obervance_rule'] = 0;
}
elseif($dow == 6)
@ -72,12 +72,12 @@ class holidaycalc {
$holidays[$i]['month'] = $holiday['month'];
$holidays[$i]['occurence'] = $holiday['occurence'];
$holidays[$i]['dow'] = $holiday['dow'];
$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day-1,$year) - $datetime->tz_offset;
$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day-1,$year);
$holidays[$i]['obervance_rule'] = 0;
}
}
}
$date = mktime(0,0,0,$holiday['month'],$day,$year) - $datetime->tz_offset;
$date = mktime(0,0,0,$holiday['month'],$day,$year);
return $date;
}