extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 19:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverting using zPush TimezoneUtil, as it causes Outlook sync to stall

Browse Source
This commit is contained in:
Ralf Becker 2017-02-27 20:08:32 +01:00
parent bb4c7a8b71
commit b75d8e6692
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,9 +353,7 @@ 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) {
@ -1042,12 +1040,7 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
// set timezone // set timezone
try { try {
//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.':'.$event['tzid']); $as_tz = self::tz2as($event['tzid']);
//$as_tz = self::tz2as($event['tzid']);
//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.':'. array2string($as_tz ));
// Using TimezoneUtil from zpush to transform from name to as_tz array
$as_tz = TimezoneUtil::GetFullTZFromTZName($event['tzid']);
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' TimeZone:'.$event['tzid'].' transforms to:'. array2string($as_tz ));
$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz)); $message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
} }
catch(Exception $e) { catch(Exception $e) {
@ -1714,9 +1707,7 @@ 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($tz);
//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));