mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
Fix recur_enddate during import/export
This commit is contained in:
parent
ac7424612e
commit
d82ca7378b
@ -248,17 +248,15 @@ class calendar_ical extends calendar_boupdate
|
||||
}
|
||||
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']]))
|
||||
{
|
||||
self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']);
|
||||
}
|
||||
// all calculations in the event's timezone
|
||||
$time->setTimezone(self::$tz_cache[$event['tzid']]);
|
||||
$time->setTime(0, 0, 0);
|
||||
$delta = $event['end'] - (int)$time->format('U');
|
||||
// Adjust recur_enddate to end time
|
||||
$event['recur_enddate'] += $delta;
|
||||
$time->setTime(23, 59, 59);
|
||||
$event['recur_enddate'] = $this->date2ts($time);
|
||||
}
|
||||
|
||||
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;
|
||||
$rriter->next_no_exception();
|
||||
}
|
||||
$delta = $event['end'] - $event['start'];
|
||||
$last->modify('+' . $delta . ' seconds');
|
||||
$last->setTime(0, 0, 0);
|
||||
$event['recur_enddate'] = $this->date2ts($last);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user