Fixed several errors

[gosa.git] / plugins / admin / systems / class_servDB.inc

diff --git a/plugins/admin/systems/class_servDB.inc b/plugins/admin/systems/class_servDB.inc
index 58b26e7663f4159e4fd49fd2350da308bcde0766..6d4e25bc79449849a299a29c62723b6bebefe22c 100644 (file)
--- a/plugins/admin/systems/class_servDB.inc
+++ b/plugins/admin/systems/class_servDB.inc
@@ -27,6 +27,10 @@ class servdb extends plugin
   var $goFonAreaCode= "";
   var $goFonCountryCode= "";
   var $ignore_account= TRUE;
+  var $goGlpiAdmin="";
+  var $goGlpiDatabase = "";
+  var $goGlpiPassword ="";
+  
 
   /* attribute list for save action */
   var $attributes= array("goImapName", "goImapConnect", "goImapAdmin", "goImapPassword",
@@ -79,9 +83,6 @@ class servdb extends plugin
       $smarty->assign("$attr"."ACL", chkacl($this->acl, $attr));
     }
 
-    /* Don't show Asterisk for non-required attribute ipHostNumber and macAddress */
-    $smarty->assign("staticAddress", "");
-
     /* Classes... */
     foreach ($this->additionaloc as $oc => $dummy){
       if (isset($this->objectclasses[$oc])){
@@ -126,7 +127,16 @@ class servdb extends plugin
   /* Check supplied data */
   function check()
   {
-    $message= array();
+    /* Call common method to give check the hook */
+    $message= plugin::check();
+
+    if(in_array("goGlpiServer",$this->objectclasses)){
+      foreach(array("goGlpiAdmin","goGlpiDatabase") as $attr){
+        if(empty($this->$attr)){
+          $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr);
+        }
+      }
+    }
 
     /* All fields are marked as *must* */
     if (in_array("goImapServer", $this->objectclasses)){
@@ -136,6 +146,7 @@ class servdb extends plugin
         }
       }
 
+
       /* Check connect string */
       if (!preg_match('/^\{[^:]+:[0-9]+.*\}$/', $this->goImapConnect)){
         $message[]= sprintf(_("The imap connect string needs to be in the form '%s'."),
@@ -228,8 +239,10 @@ class servdb extends plugin
     /* Write to LDAP */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
+    $this->cleanup();
+    $ldap->modify ($this->attrs); 
+
+    show_ldap_error($ldap->get_error(), _("Saving server db settings failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){