Merge branch 'alldayevents' into 'master'

Do not set timezone information for all-day events See merge request grommunio/grommunio-sync!93
grommunio · Oct 25, 2024 · fa3fdd2 · fa3fdd2
2 parents 95f2ba4 + de28dfc
commit fa3fdd2
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/lib/grommunio/mapiprovider.php b/lib/grommunio/mapiprovider.php
@@ -1417,7 +1417,7 @@ private function setAppointment($mapimessage, $appointment) {
 		if (isset($appointment->timezone)) {
 			$tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
 		}
-		// AS 16: doesn't sent a timezone - use server TZ and convert starttime and endtime
+		// AS 16: doesn't sent a timezone - use server TZ
 		elseif (Request::GetProtocolVersion() >= 16.0 && isset($appointment->alldayevent) && $appointment->alldayevent) {
 			$tz = TimezoneUtil::GetFullTZ();
 		}
@@ -1603,15 +1603,7 @@ private function setAppointment($mapimessage, $appointment) {
 			$this->setASlocation($appointment->location2, $props, $appointmentprops);
 		}
 		if ($tz !== false) {
-			// Use server timezone for as 16
-			if (Request::GetProtocolVersion() >= 16.0 && isset($appointment->alldayevent) && $appointment->alldayevent) {
-				$tzdef = TimezoneUtil::GetBinaryTZ();
-				if ($tzdef) {
-					$props[$appointmentprops["tzdefstart"]] = $tzdef;
-					$props[$appointmentprops["tzdefend"]] = $tzdef;
-				}
-			}
-			else {
+			if (!(Request::GetProtocolVersion() >= 16.0 && isset($appointment->alldayevent) && $appointment->alldayevent)) {
 				$props[$appointmentprops["timezonetag"]] = $this->getMAPIBlobFromTZ($tz);
 			}
 		}