extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 18:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mounthly by day recurrence issues

Browse Source
This commit is contained in:
Jörg Lehrke 2010-04-27 11:47:56 +00:00
parent 8ce6ac92ae
commit a2e2c5f797
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_rrule.inc.php
View File

@ -313,7 +313,7 @@ class calendar_rrule implements Iterator
{ {
list($year,$month) = explode('-',$time->format('Y-m')); list($year,$month) = explode('-',$time->format('Y-m'));
$last_day = new egw_time(); $last_day = new egw_time();
$last_day->setDate($year,$month-1,0); $last_day->setDate($year,$month+1,0);
return (int)$last_day->format('d'); return (int)$last_day->format('d');
} }
@ -568,8 +568,9 @@ class calendar_rrule implements Iterator
break; break;
case self::MONTHLY_WDAY: // weekday of the month: BDAY={1..5}+ {MO..SO} case self::MONTHLY_WDAY: // weekday of the month: BDAY={1..5}+ {MO..SO}
$rrule['BYDAY'] = $this->monthly_byday_num . '+ ' . $rrule['BYDAY'] = abs($this->monthly_byday_num);
strtoupper(substr($this->time->format('l'),0,2)); $rrule['BYDAY'] .= ($this->monthly_byday_num < 0) ? '- ' : '+ ';
$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'),0,2));
$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY']; $rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
break; break;
} }