From 18c3ed19f40ebba329a16287be5e15d2f98e6bda Mon Sep 17 00:00:00 2001 From: ralf Date: Tue, 6 Jun 2023 11:00:06 +0200 Subject: [PATCH] * eSync: fix meeting requests confirmed via ActiveSync protocol got wrong time if user- and server-timezone was different --- calendar/inc/class.calendar_ical.inc.php | 2 +- calendar/inc/class.calendar_zpush.inc.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index f1db4ab0c2..a7ae2c13c9 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -2527,7 +2527,7 @@ class calendar_ical extends calendar_boupdate } // Remove videoconference link appended to description in calendar_groupdav->iCal() - if (class_exists('EGroupware\Status\Videoconference\Call')) + if (!empty($event['description']) && class_exists('EGroupware\Status\Videoconference\Call')) { $regex = "/^(\r?\n)?(Videoconference|" . lang('Videoconference') . "):\r?\n" . str_replace('/','\/',EGroupware\Status\Videoconference\Call::getMeetingRegex()) ."(\r?\n)*/im"; $event['description'] = preg_replace($regex, '', $event['description']); diff --git a/calendar/inc/class.calendar_zpush.inc.php b/calendar/inc/class.calendar_zpush.inc.php index 82d219590f..dafa21bddd 100644 --- a/calendar/inc/class.calendar_zpush.inc.php +++ b/calendar/inc/class.calendar_zpush.inc.php @@ -464,6 +464,9 @@ class calendar_zpush implements activesync_plugin_write, activesync_plugin_meeti calendar_so::split_status($event['participants'][$uid], $quantity, $role); $status = calendar_so::combine_status($status_in, $quantity, $role); + // convert to user-time, as that is what calendar_boupdate expects + $this->calendar->server2usertime($event); + if ($event['id'] && isset($event['participants'][$uid])) { $ret = $this->calendar->set_status($event, $uid, $status) ? $event['id'] : false;