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

Fix recur_enddate during import/export

Browse Source
This commit is contained in:
Jörg Lehrke 2010-01-05 18:06:07 +00:00
parent ac7424612e
commit d82ca7378b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_ical.inc.php
View File

@ -248,17 +248,15 @@ class calendar_ical extends calendar_boupdate
} }
elseif ($event['recur_enddate']) elseif ($event['recur_enddate'])
{ {
$time = new egw_time($event['start'],egw_time::$server_timezone); $time = new egw_time($event['recur_enddate'],egw_time::$server_timezone);
if (!isset(self::$tz_cache[$event['tzid']])) if (!isset(self::$tz_cache[$event['tzid']]))
{ {
self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']); self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']);
} }
// all calculations in the event's timezone // all calculations in the event's timezone
$time->setTimezone(self::$tz_cache[$event['tzid']]); $time->setTimezone(self::$tz_cache[$event['tzid']]);
$time->setTime(0, 0, 0); $time->setTime(23, 59, 59);
$delta = $event['end'] - (int)$time->format('U'); $event['recur_enddate'] = $this->date2ts($time);
// Adjust recur_enddate to end time
$event['recur_enddate'] += $delta;
} }
if ($this->log) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".array2string($event)."\n",3,$this->logfile); if ($this->log) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".array2string($event)."\n",3,$this->logfile);
@ -2122,6 +2120,8 @@ class calendar_ical extends calendar_boupdate
$last = clone $rriter->current; $last = clone $rriter->current;
$rriter->next_no_exception(); $rriter->next_no_exception();
} }
$delta = $event['end'] - $event['start'];
$last->modify('+' . $delta . ' seconds');
$last->setTime(0, 0, 0); $last->setTime(0, 0, 0);
$event['recur_enddate'] = $this->date2ts($last); $event['recur_enddate'] = $this->date2ts($last);
} }