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

real Exceptions not always shown, because using SyncAppointment instead of SyncAppointmentException did not render required ExceptionStartTime

Browse Source 
Thanks to Sebastian from Z-Push
This commit is contained in:
Ralf Becker 2016-06-20 22:10:23 +02:00
parent 0787e03378
commit eae2b52f79
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ use EGroupware\Api;
use EGroupware\Api\Acl; use EGroupware\Api\Acl;
/** /**
* Required for TZID <--> AS timezone blog test, if script is called directly via URL * Required for TZID <--> AS timezone blob test, if script is called directly via URL
*/ */
if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
{ {
@ -993,9 +993,10 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
* @param string $folderid * @param string $folderid
* @param string|array $id cal_id or event array (used internally) * @param string|array $id cal_id or event array (used internally)
* @param ContentParameters $contentparameters * @param ContentParameters $contentparameters
* @param string $class ='SyncAppointment' or 'SyncAppointmentException'
* @return SyncAppointment|boolean false on error * @return SyncAppointment|boolean false on error
*/ */
public function GetMessage($folderid, $id, $contentparameters) public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
{ {
if (!isset($this->calendar)) $this->calendar = new calendar_boupdate(); if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace()); //error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
@ -1025,7 +1026,7 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
{ {
ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s',$ex)); ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s',$ex));
} }
$message = new SyncAppointment(); $message = new $class();
// set timezone // set timezone
try { try {
@ -1192,7 +1193,7 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
foreach($ex_events as $ex_event) foreach($ex_events as $ex_event)
{ {
if ($ex_event['id'] == $event['id']) continue; // ignore series master if ($ex_event['id'] == $event['id']) continue; // ignore series master
$exception = $this->GetMessage($folderid, $ex_event, $contentparameters); $exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
$exception->exceptionstarttime = $exception_time = $ex_event['recurrence']; $exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported) foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
{ {