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

* Calendar/eSync: fix events created on the device are added to the server in a wrong timezone / shifted by some hours

Browse Source
This commit is contained in:
ralf 2024-02-08 15:06:05 +02:00
parent dc375f8e02
commit 22a39c6a39
1 changed files with 4 additions and 5 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

@ -559,7 +559,7 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
list($id,$recur_date) = explode(':', $_id)+[null,null]; list($id,$recur_date) = explode(':', $_id)+[null,null];
if ($type != 'calendar' || $id && !($old_event = $this->calendar->read($id, $recur_date, false, 'server'))) if ($type != 'calendar' || $id && !($old_event = $this->calendar->read($id, $recur_date)))
{ {
ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) Folder wrong or event does not existing"); ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) Folder wrong or event does not existing");
return false; return false;
@ -589,9 +589,6 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
$skip_notification = true; // to avoid double notification from client AND Server $skip_notification = true; // to avoid double notification from client AND Server
} }
// event is read in server-time, as is AS message, therefore we need to convert to user-time, which is expected by calendar_boupdate
$this->calendar->server2usertime($event);
$messages = null; $messages = null;
if (!($id = $this->calendar->update($event, true, true, false, true, $messages, $skip_notification))) if (!($id = $this->calendar->update($event, true, true, false, true, $messages, $skip_notification)))
{ {
@ -650,10 +647,12 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti
/** /**
* Parse AS message into EGw event array * Parse AS message into EGw event array
* *
* The returned event is in user-timezone, ready to be saved by BO class operating in user-timezone.
*
* @param SyncAppointment $message * @param SyncAppointment $message
* @param int $account * @param int $account
* @param array $event =array() * @param array $event =array()
* @return array * @return array event in user-timezone
*/ */
private function message2event(SyncAppointment $message, $account, $event=array()) private function message2event(SyncAppointment $message, $account, $event=array())
{ {