[jan] Ignore iCalendar alarms without action, and use first, not last…

… alarm (Bug #12865). Conflicts: kronolith/docs/CHANGES kronolith/package.xml
horde · Nov 27, 2013 · 9422ef8 · 9422ef8
1 parent fcd11ab
commit 9422ef8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
@@ -2,6 +2,8 @@
 v4.1.5-git
 ----------
 
+[jan] Ignore iCalendar alarms without action, and use first, not last alarm
+      (Bug #12865).
 [mjr] Fix incorrect case comparison when synchronizing tags with Kolab (Bug
       #12770).
 [mjr] Honor recurrence-id range values when deleting recurring events (Bug

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -1187,6 +1187,12 @@ public function fromiCalendar($vEvent)
             if (!($alarm instanceof Horde_Icalendar_Valarm)) {
                 continue;
             }
+            try {
+                if ($alarm->getAttribute('ACTION') == 'NONE') {
+                    continue;
+                }
+            } catch (Horde_Icalendar_Exception $e) {
+            }
             try {
                 // @todo consider implementing different ACTION types.
                 // $action = $alarm->getAttribute('ACTION');
@@ -1220,6 +1226,7 @@ public function fromiCalendar($vEvent)
             if (!$haveTrigger) {
                 $this->alarm = -intval($trigger / 60);
             }
+            break;
         }
 
         // Alarm snoozing/dismissal

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Ignore iCalendar alarms without action, and use first, not last alarm (Bug #12865).
 * [mjr] Fix incorrect case comparison when synchronizing tags with Kolab (Bug #12770).
 * [mjr] Honor recurrence-id range values when deleting recurring events (Bug #12746).
 * [mjr] Fix deleting and sending iTip notifications for recurring events (Bug: 12746).
@@ -2243,6 +2244,7 @@
    <date>2013-10-29</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Ignore iCalendar alarms without action, and use first, not last alarm (Bug #12865).
 * [mjr] Fix incorrect case comparison when synchronizing tags with Kolab (Bug #12770).
 * [mjr] Honor recurrence-id range values when deleting recurring events (Bug #12746).
 * [mjr] Fix deleting and sending iTip notifications for recurring events (Bug: 12746).