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

Calendar: Fix wrong EXDATE values

Browse Source 
Current iCal export always puts exdates into UTC.  Now pre-adjusting the dates to counteract that.
This commit is contained in:
nathangray 2020-04-28 10:47:38 -06:00
parent 79f8079150
commit 5864368386
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,10 +672,11 @@ class calendar_ical extends calendar_boupdate
{ {
foreach ($event['recur_exception'] as $key => $timestamp) foreach ($event['recur_exception'] as $key => $timestamp)
{ {
// current Horde_Icalendar 2.1.4 exports EXDATE always postfixed with a Z :( // current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, postfixed with a Z :(
// so if we set a timezone here, we have to remove the Z, see the hack at the end of this method // so if we set a timezone here, we have to remove the Z, see the hack at the end of this method
// Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID // Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
$event['recur_exception'][$key] = self::getDateTime($timestamp, $tzid, $parameters['EXDATE']); $ex_date = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
$event['recur_exception'][$key] = self::getDateTime($ex_date->format('ts') + $ex_date->getOffset(), $tzid, $parameters['EXDATE']);
} }
} }
else else