Merge pull request #327 from humhub/fix/326-cancelled-event-notificat…

…ions Don't send notifications for canceled events
humhub · Jul 26, 2022 · 210f813 · 210f813
2 parents 8e14404 + fa74b23
commit 210f813
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2.6 (Unreleased)
+--------------------
+- Fix #327: Don't send notifications for canceled event
+
+
 1.2.5 (July 15, 2022)
 --------------------
 - Fix #315: Fix participants list settings visibility

diff --git a/models/forms/CalendarEntryForm.php b/models/forms/CalendarEntryForm.php
@@ -467,7 +467,7 @@ public function save()
 
             Topic::attach($this->entry->content, $this->topics);
 
-            if ($this->sendUpdateNotification && !$this->entry->isNewRecord) {
+            if ($this->sendUpdateNotification && !$this->entry->isNewRecord && !$this->entry->closed) {
                 $this->entry->participation->sendUpdateNotification();
             }
 

diff --git a/models/forms/CalendarEntryParticipationForm.php b/models/forms/CalendarEntryParticipationForm.php
@@ -124,7 +124,7 @@ public function save()
                 RichText::postProcess($this->entry->participant_info, $this->entry);
             }
 
-            if ($this->sendUpdateNotification && !$this->entry->isNewRecord) {
+            if ($this->sendUpdateNotification && !$this->entry->isNewRecord && !$this->entry->closed) {
                 $this->entry->participation->sendUpdateNotification();
             }
 

diff --git a/models/reminder/ReminderProcessor.php b/models/reminder/ReminderProcessor.php
@@ -86,6 +86,10 @@ private function runByUpcomingEvents(ContentContainerActiveRecord $container = n
                 continue;
             }
 
+            if ($entry->closed) {
+                continue;
+            }
+
             $skipUsers = $this->handleEntryLevelReminder($entry);
 
             if($skipUsers === true) {
@@ -114,6 +118,10 @@ private function runEntryLevelOnly()
                 continue;
             }
 
+            if ($entry->closed) {
+                continue;
+            }
+
             $entryKey = get_class($entry).':'.$entry->id;
             if(!isset($entryHandled[$entryKey])) {
                 $this->handleEntryLevelReminder($entry);

diff --git a/module.json b/module.json
@@ -3,7 +3,7 @@
     "name": "Calendar",
     "description": "Calendar for spaces or user profiles.",
     "keywords": ["calendar"],
-    "version": "1.2.5",
+    "version": "1.2.6",
     "humhub": {
         "minVersion": "1.10"
     },