Reverted servDB changes

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

diff --git a/plugins/admin/systems/class_servDB.inc b/plugins/admin/systems/class_servDB.inc
index f7bd9b61817c3d017461b9e8d9242c76a2869a34..6d4e25bc79449849a299a29c62723b6bebefe22c 100644 (file)
--- a/plugins/admin/systems/class_servDB.inc
+++ b/plugins/admin/systems/class_servDB.inc
@@ -39,8 +39,11 @@ class servdb extends plugin
                          "goLogAdmin", "goLogPassword", "goFonAdmin", "goFonPassword",
                          "goFonAreaCode", "goFonCountryCode","goGlpiAdmin","goGlpiDatabase","goGlpiPassword");
   var $objectclasses= array("top", "goServer");
-  var $additionaloc= array(
-                         "goKrbServer" => array("goKrbRealm", "goKrbAdmin",
+  var $additionaloc= array("goImapServer" => array("goImapName", "goImapConnect",
+                                                "goImapAdmin", "goImapPassword",
+                                                "goImapSieveServer", 
+                                                "goImapSievePort"),
+                          "goKrbServer" => array("goKrbRealm", "goKrbAdmin",
                                                 "goKrbPassword"),
                           "goFaxServer" => array("goFaxAdmin", "goFaxPassword"),
                           "goLogDBServer" => array("goLogAdmin", "goLogPassword"),
@@ -136,7 +139,7 @@ class servdb extends plugin
     }
 
     /* All fields are marked as *must* */
-    if (1 == 0 && in_array("goImapServer", $this->objectclasses)){
+    if (in_array("goImapServer", $this->objectclasses)){
       foreach (array("goImapAdmin", "goImapName") as $attr){
         if ($this->$attr == "" || preg_match("/ /", $this->$attr)){
           $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr);