Fix checking for past event when it is created from different time zone

docs/CHANGELOG.md

@@ -1,9 +1,10 @@
 Changelog
 =========
 
-Unreleased
-------------------------
+1.5.11 (Unreleased)
+-----------------------
 - Enh #473: Add footer to global calendar
+- Fix #474: Fix checking for past event when it is created from different time zone
 
 1.5.10 (March 19, 2024)
 -----------------------

models/CalendarEntry.php

@@ -3,6 +3,7 @@
 namespace humhub\modules\calendar\models;
 
 use DateTime;
+use DateTimeZone;
 use humhub\modules\calendar\helpers\CalendarUtils;
 use humhub\modules\calendar\helpers\RecurrenceHelper;
 use humhub\modules\calendar\helpers\Url;
@@ -1066,7 +1067,14 @@ public function canInvite(?User $user = null): bool
 
     public function isPast(): bool
     {
-        $timeZone = CalendarUtils::getEndTimeZone($this);
-        return new DateTime('now', $timeZone) > new DateTime($this->end_datetime ?? 'now', $timeZone);
+        $currentTimeZone = new DateTimeZone(Yii::$app->timeZone);
+
+        $now = (new DateTime('now'))
+            ->setTimezone($currentTimeZone);
+        $end = (new DateTime($this->end_datetime ?? 'now'))
+            ->setTimezone(CalendarUtils::getEndTimeZone($this))
+            ->setTimezone($currentTimeZone);
+
+        return $now > $end;
     }
 }

module.json

@@ -3,7 +3,7 @@
     "name": "Calendar",
     "description": "Create one-time or recurring events, invite and manage attendees, and keep track of all your events with the Calendar module.",
     "keywords": ["calendar"],
-    "version": "1.5.10",
+    "version": "1.5.11",
     "humhub": {
         "minVersion": "1.14"
     },