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

replace calendar_zpush::tz2as with TimezoneUtil::GetFullTZFromTZName call, as it seems to produce more accurate results

Browse Source
This commit is contained in:
Klaus Leithoff 2017-02-23 11:32:22 +00:00
parent 2ba626ac04
commit 621363820d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,7 +353,9 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
$message = new SyncMeetingRequest(); $message = new SyncMeetingRequest();
// set timezone // set timezone
try { try {
$as_tz = self::tz2as($event['tzid']); //$as_tz = self::tz2as($event['tzid']);
// Using TimezoneUtil from zpush to transform from name to as_tz array
$as_tz = TimezoneUtil::GetFullTZFromTZName($event['tzid']);
$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz)); $message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
} }
catch(Exception $e) { catch(Exception $e) {
@ -1712,7 +1714,9 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
$ical_tz = $ical; $ical_tz = $ical;
$ical_arr = calendar_zpush::ical2array($ical_tz); $ical_arr = calendar_zpush::ical2array($ical_tz);
//echo "<pre>".print_r($ical_arr,true)."</pre>\n"; //echo "<pre>".print_r($ical_arr,true)."</pre>\n";
$as_tz = calendar_zpush::tz2as($tz); //$as_tz = calendar_zpush::tz2as($tz);
// Using TimezoneUtil from zpush to transform from name to as_tz array
$as_tz = TimezoneUtil::GetFullTZFromTZName($event['tzid']);
//echo "$tz=<pre>".print_r($as_tz,true)."</pre>\n"; //echo "$tz=<pre>".print_r($as_tz,true)."</pre>\n";
$as_tz_org = calendar_zpush::_getTZFromSyncBlob(base64_decode($sync_blob)); $as_tz_org = calendar_zpush::_getTZFromSyncBlob(base64_decode($sync_blob));