Merge branch '136-all-day-events-spanning-two-days-on-ios' into 'master'

More all day event fixes

Closes #136

See merge request grommunio/grommunio-sync!106

Author: grammmike

lib/grommunio/mapiprovider.php

@@ -369,7 +369,10 @@ private function getAppointment($mapimessage, $contentparameters) {
 			}
 			else {
 				// AS 16: apply timezone as this MUST result in midnight (to be sent to the client)
-				$message->starttime = $this->getLocaltimeByTZ($message->starttime, $tz);
+				// Adjust for TZ only if a timezone was saved with the message. Don't apply server TZ here.
+				if ($message->timezone) {
+					$message->starttime = $this->getLocaltimeByTZ($message->starttime, $tz);
+				}
 			}
 			$message->endtime = $message->starttime + $duration;
 			if (Request::GetProtocolVersion() >= 16.0) {

lib/utils/timezoneutil.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
  * SPDX-License-Identifier: AGPL-3.0-only
  * SPDX-FileCopyrightText: Copyright 2007-2016 Zarafa Deutschland GmbH
- * SPDX-FileCopyrightText: Copyright 2020-2024 grommunio GmbH
+ * SPDX-FileCopyrightText: Copyright 2020-2025 grommunio GmbH
  *
  * Class to generate AS compatible timezone information
  */
@@ -1462,17 +1463,17 @@ public static function GetTzFromTimezoneDef($tzdef) {
 				$tz['bias'] = $rule['bias'];
 				$tz['dstendyear'] = $rule['stStandardDate']['year'];
 				$tz['dstendmonth'] = $rule['stStandardDate']['month'];
-				$tz['dstendday'] = $rule['stStandardDate']['day'];
-				$tz['dstendweek'] = $rule['stStandardDate']['dayofweek'];
+				$tz['dstendday'] = $rule['stStandardDate']['dayofweek'];
+				$tz['dstendweek'] = $rule['stStandardDate']['day'];
 				$tz['dstendhour'] = $rule['stStandardDate']['hour'];
 				$tz['dstendminute'] = $rule['stStandardDate']['minute'];
 				$tz['dstendsecond'] = $rule['stStandardDate']['second'];
 				$tz['dstendmillis'] = $rule['stStandardDate']['miliseconds'];
 				$tz['stdbias'] = $rule['stdbias'];
 				$tz['dststartyear'] = $rule['stDaylightDate']['year'];
 				$tz['dststartmonth'] = $rule['stDaylightDate']['month'];
-				$tz['dststartday'] = $rule['stDaylightDate']['day'];
-				$tz['dststartweek'] = $rule['stDaylightDate']['dayofweek'];
+				$tz['dststartday'] = $rule['stDaylightDate']['dayofweek'];
+				$tz['dststartweek'] = $rule['stDaylightDate']['day'];
 				$tz['dststarthour'] = $rule['stDaylightDate']['hour'];
 				$tz['dststartminute'] = $rule['stDaylightDate']['minute'];
 				$tz['dststartsecond'] = $rule['stDaylightDate']['second'];