From 7fb94c01e7b32caf1833bbf3e8ba1810dfb05bbd Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 26 Apr 2010 17:50:56 +0200
Subject: [PATCH] MFB: Set an alarm to one minute, if users try to set an alarm
 without time.

---
 nag/docs/CHANGES               |  1 +
 nag/lib/Forms/task.php         | 12 +++++++-----
 nag/lib/Ui/VarRenderer/Nag.php |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
index f5e8a49fb..9fa8ef817 100644
--- a/nag/docs/CHANGES
+++ b/nag/docs/CHANGES
@@ -15,6 +15,7 @@ v3.0-git
 v2.3.5-cvs
 ----------
 
+[jan] Set an alarm to one minute, if users try to set an alarm without time.
 [jan] Add missing preference for not sending update notifications to yourself
       (Joel Smith <js-horde@jk1.net>, Request #8978).
 [gwr] Fix organizer field not saved in tasks (kolab/issue3888).
diff --git a/nag/lib/Forms/task.php b/nag/lib/Forms/task.php
index 6639838bb..878d3b224 100644
--- a/nag/lib/Forms/task.php
+++ b/nag/lib/Forms/task.php
@@ -215,8 +215,14 @@ class Horde_Form_Type_nag_alarm extends Horde_Form_Type {
         $info = $var->getValue($vars);
         if (!$info['on']) {
             $info = 0;
+        } else {
+            $value = $info['value'];
+            $unit = $info['unit'];
+            if ($value == 0) {
+                $value = $unit = 1;
+            }
+            $info = $value * $unit;
         }
-        $info = $info['value'] * $info['unit'];
     }
 
     function isValid(&$var, &$vars, $value, &$message)
@@ -226,10 +232,6 @@ class Horde_Form_Type_nag_alarm extends Horde_Form_Type {
                 $message = _("A due date must be set to enable alarms.");
                 return false;
             }
-            if (empty($value['value'])) {
-                $message = _("The alarm value must not be empty.");
-                return false;
-            }
         }
 
         return true;
diff --git a/nag/lib/Ui/VarRenderer/Nag.php b/nag/lib/Ui/VarRenderer/Nag.php
index cc30da360..8d2247741 100644
--- a/nag/lib/Ui/VarRenderer/Nag.php
+++ b/nag/lib/Ui/VarRenderer/Nag.php
@@ -11,7 +11,7 @@
 
 /**
  * The Horde_Ui_VarRenderer_Nag class provides additional methods for
- * rendering Horde_Form_Type_alarm fields.
+ * rendering Nag specific fields.
  *
  * @todo    Clean this hack up with Horde_Form/H4
  * @author  Jan Schneider <jan@horde.org>
-- 
2.11.0