[jan] Delete Horde alarms when resetting an event alarm.

[jan] Set an alarm to one minute, if users try to set an alarm without time.

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index 2508316..500d605 100644 (file)
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -31,7 +31,8 @@ v3.0-git
 v2.3.4-cvs
 ----------
 
-
+[jan] Delete Horde alarms when resetting an event alarm.
+[jan] Set an alarm to one minute, if users try to set an alarm without time.
 
 
 ------

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index 92b7e37..24db9b9 100644 (file)
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -499,6 +499,8 @@ abstract class Kronolith_Event
             $alarm['start'] = new Horde_Date($alarm['start']);
             $alarm['end'] = new Horde_Date($alarm['end']);
             $GLOBALS['injector']->getInstance('Horde_Alarm')->set($alarm);
+        } else {
+            $GLOBALS['injector']->getInstance('Horde_Alarm')->delete($this->uid);
         }
 
         return $result;
@@ -2057,7 +2059,12 @@ abstract class Kronolith_Event
         // Alarm.
         if (!is_null($alarm = Horde_Util::getFormData('alarm'))) {
             if ($alarm) {
-                $this->alarm = Horde_Util::getFormData('alarm_value') * Horde_Util::getFormData('alarm_unit');
+                $value = Horde_Util::getFormData('alarm_value');
+                $unit = Horde_Util::getFormData('alarm_unit');
+                if ($value == 0) {
+                    $value = $unit = 1;
+                }
+                $this->alarm = $value * $unit;
                 // Notification.
                 if (Horde_Util::getFormData('alarm_change_method')) {
                     $types = Horde_Util::getFormData('event_alarms');