extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

GNU Path #150 - holidaycalc - occurence holidays shown wrong.

Browse Source
This commit is contained in:
skeeter 2002-02-20 02:01:55 +00:00
parent e9be751ce7
commit 9e0d7f1d7a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,15 +23,25 @@ class holidaycalc {
if($holiday['occurence'] != 99)
{
$dow = $datetime->day_of_week($year,$holiday['month'],1);
$day = (((7 * $holiday['occurence']) - 6) + (($holiday['dow'] - $dow) % 7));
$day = (((7 * $holiday['occurence']) - 6) + ((($holiday['dow'] + 7) - $dow) % 7));
$day += ($day < 1 ? 7 : 0);
$day += ($holiday['dow']==1 ? 7 : 0);
// What is the point of this?
// Add 7 when the holiday falls on a Monday???
//$day += ($holiday['dow']==1 ? 7 : 0);
// Sometimes the 5th occurance of a weekday (ie the 5th monday)
// can spill over to the next month. This prevents that.
$ld = $datetime->days_in_month($holiday['month'],$year);
if ($day > $ld)
{
return;
}
}
else
{
$ld = $datetime->days_in_month($holiday['month'],$year);
$dow = $datetime->day_of_week($year,$holiday['month'],$ld);
$day = $ld - ($dow - $holiday['dow']) % 7 ;
$day = $ld - (($dow + 7) - $holiday['dow']) % 7 ;
}
}
else