Fixes for sending iTips in various cases.

horde · Feb 4, 2016 · 1b37ba1 · 1b37ba1
1 parent 1561356
commit 1b37ba1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/kronolith/lib/Ajax/Application/Handler.php b/kronolith/lib/Ajax/Application/Handler.php
@@ -387,7 +387,9 @@ public function saveEvent()
                     $event->save();
                 }
             }
-            if (!$event->organizer || Kronolith::isUserEmail($this->creator, $event->organizer)) {
+
+            // Only the ORGANIZER's copy should trigger a REQUEST or CANCEL.
+            if (empty($event->organizer)) {
                 $type = $event->status == Kronolith::STATUS_CANCELLED
                     ? Kronolith::ITIP_CANCEL
                     : Kronolith::ITIP_REQUEST;
@@ -398,7 +400,7 @@ public function saveEvent()
         // Send a CANCEL iTip for attendees that have been removed, but only if
         // the entire event isn't being marked as cancelled (which would be
         // caught above).
-        if (!empty($removed_attendees)) {
+        if (empty($event->organizer) && !empty($removed_attendees)) {
             $to_cancel = array();
             foreach ($removed_attendees as $email) {
                 $to_cancel[$email] = $old_attendees[$email];

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
@@ -1940,6 +1940,12 @@ public static function sendITipNotifications(
         }
 
         foreach ($mail_attendees as $email => $status) {
+            /* Don't send notifications to the ORGANIZER if this is the
+             * ORGANIZER's copy of the event. */
+            if (!$event->organizer && Kronolith::isUserEmail($event->creator, $email)) {
+                continue;
+            }
+
             /* Don't bother sending an invitation/update if the recipient does
              * not need to participate, or has declined participating, or
              * doesn't have an email address. */