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

using calendar_zpush not calendar_activesync

Browse Source
This commit is contained in:
Ralf Becker 2015-09-04 15:40:47 +00:00
parent 8b6ba73c79
commit f55ce966cb
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_zpush.inc.php
View File

@ -336,7 +336,7 @@ return array(); // temporary disabling meeting requests from calendar
// set timezone // set timezone
try { try {
$as_tz = self::tz2as($event['tzid']); $as_tz = self::tz2as($event['tzid']);
$message->timezone = base64_encode(calendar_activesync::_getSyncBlobFromTZ($as_tz)); $message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
} }
catch(Exception $e) { catch(Exception $e) {
// ignore exception, simply set no timezone, as it is optional // ignore exception, simply set no timezone, as it is optional
@ -1662,17 +1662,17 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
// get as timezone data for a given timezone // get as timezone data for a given timezone
$ical = calendar_timezones::tz2id($tz,'component'); $ical = calendar_timezones::tz2id($tz,'component');
//echo "<pre>".print_r($ical,true)."</pre>\n"; //echo "<pre>".print_r($ical,true)."</pre>\n";
$ical_arr = calendar_activesync::ical2array($ical_tz=$ical); $ical_arr = calendar_zpush::ical2array($ical_tz=$ical);
//echo "<pre>".print_r($ical_arr,true)."</pre>\n"; //echo "<pre>".print_r($ical_arr,true)."</pre>\n";
$as_tz = calendar_activesync::tz2as($tz); $as_tz = calendar_zpush::tz2as($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_activesync::_getTZFromSyncBlob(base64_decode($sync_blob)); $as_tz_org = calendar_zpush::_getTZFromSyncBlob(base64_decode($sync_blob));
//echo "sync_blob=<pre>".print_r($as_tz_org,true)."</pre>\n"; //echo "sync_blob=<pre>".print_r($as_tz_org,true)."</pre>\n";
// find matching timezone from as data // find matching timezone from as data
// this returns the FIRST match, which is in case of Pacific/Auckland eg. Antarctica/McMurdo ;-) // this returns the FIRST match, which is in case of Pacific/Auckland eg. Antarctica/McMurdo ;-)
$matched = calendar_activesync::as2tz($as_tz); $matched = calendar_zpush::as2tz($as_tz);
//echo array2string($matched); //echo array2string($matched);
echo "<tr><td><b onclick='toggle_display(this.nextSibling);' style='cursor:pointer;'>$tz</b><pre style='margin:0; font-size: 90%; display:none;'>$ical</pre></td><td>$as_tz_org[bias]<br/>$as_tz[bias]</td><td>$as_tz_org[dstbias]<br/>$as_tz[dstbias]</td>\n"; echo "<tr><td><b onclick='toggle_display(this.nextSibling);' style='cursor:pointer;'>$tz</b><pre style='margin:0; font-size: 90%; display:none;'>$ical</pre></td><td>$as_tz_org[bias]<br/>$as_tz[bias]</td><td>$as_tz_org[dstbias]<br/>$as_tz[dstbias]</td>\n";