extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix recurrence enddate for vCalendar 1.0, missing pieces

Browse Source
This commit is contained in:
Jörg Lehrke 2010-06-21 17:48:48 +00:00
parent 0db219ca7d
commit 50b1e6f4cc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,13 +538,6 @@ class calendar_rrule implements Iterator
$repeat_days = array();
$rrule = array();
if (!isset(self::$tz_cache['UTC']))
{
self::$tz_cache['UTC'] = calendar_timezones::DateTimeZone('UTC');
}
$utc = self::$tz_cache['UTC'];
if ($this->type == self::NONE) return false; // no recuring event
if ($version == '1.0')
@ -613,9 +606,15 @@ class calendar_rrule implements Iterator
if ($this->enddate)
{
$enddate = clone $this->enddate;
$enddate->setTimezone($utc);
$rrule['UNTIL'] = $enddate->format('Ymd\THis\Z');
$this->rewind();
$enddate = $this->current();
do
{
$this->next_no_exception();
$occurrence = $this->current();
}
while ($this->valid() && ($enddate = $occurrence));
$rrule['UNTIL'] = $enddate;
}
return $rrule;