Conference lifetime mustn't be numeric anymore

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1482 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/TODO b/TODO
index 778ca908b40c58a449b3723e728191620c7ec130..c3a84aee2636e817c24d70885d15472327d3b38f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -24,27 +24,17 @@ Things to fix before 2.4:
 * Rework printer tabs
 
 * FAI management
-  - Subtree support
-  - Hooks have to be implemented like skripts
   - Add package lists
-  - Make templates uploadable
   - Re-implement profile management, divlists look pretty ugly here
 
 * Phone account
-  - Errors while saving phone numbers with spaces
   - Errors when phone account is diabled and a user is saved (?)
 
-* Password changing for workstations doesn't work anymore
-
 * Add function to get GOto application templates -> filled variables, etc.
 
-* Disabling error messages doesn't work
-
-* Phoneaccount -> defaults + auto fill
-
-* Saving of initially created gofon stuff fails
+* Disabling error messages doesn't work, (?) For me it works;Fabian
 
-* %telephoneNumber is not filled
+* Saving of initially created gofon stuff fails (?)
 
 * Unterbäume in Applicatins wird nicht angezeigt (?)
 

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index df7fc1087b0ec061f431a134f0f0bdb8dda439ff..b9e63ae2def028050a9975064161a7cf5583fdee 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -200,7 +200,7 @@ class conference extends plugin
       $message[] =_("Only numeric chars are allowed in Number field.");
     }
 
-    if(!is_numeric($this->goFonConferenceOptionLifetime)){
+    if(!((is_numeric($this->goFonConferenceOptionLifetime))||(empty($this->goFonConferenceOptionLifetime)))){
       $message[] =_("Only numbers are allowed in Lifetime.");
     }