extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 02:19:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix occurrence count for recurring events again :-(

Browse Source
This commit is contained in:
Jörg Lehrke 2010-02-03 15:57:44 +00:00
parent 807b72aa93
commit da35c68b97
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_sif.inc.php
View File

@ -936,7 +936,6 @@ class calendar_sif extends calendar_boupdate
if ($day <= $event['start']) unset($exceptions[$key]); if ($day <= $event['start']) unset($exceptions[$key]);
} }
$event['recur_exception'] = $exceptions; $event['recur_exception'] = $exceptions;
calendar_rrule::rrule2tz($event, $event['start'], $tzid);
} }
if ($this->uidExtension) if ($this->uidExtension)
@ -990,6 +989,11 @@ class calendar_sif extends calendar_boupdate
{ {
$occurrences++; $occurrences++;
$recur_date = $rriter->current(); $recur_date = $rriter->current();
if ($this->log)
{
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
"() Client Recurrence[$occurrences] $recur_date\n", 3, $this->logfile);
}
if (!$rriter->exceptions || !in_array($recur_date->format('Ymd'),$rriter->exceptions)) if (!$rriter->exceptions || !in_array($recur_date->format('Ymd'),$rriter->exceptions))
{ {
$recur_end = $recur_date; $recur_end = $recur_date;
@ -1001,6 +1005,8 @@ class calendar_sif extends calendar_boupdate
$sifEvent .= '<PatternEndDate>'. self::getDateTime($recurEndDate,$tzid) .'</PatternEndDate>'; $sifEvent .= '<PatternEndDate>'. self::getDateTime($recurEndDate,$tzid) .'</PatternEndDate>';
} }
calendar_rrule::rrule2tz($event, $event['start'], $tzid);
$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1); $eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
switch ($event['recur_type']) switch ($event['recur_type'])