X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servDB.inc;h=cd716eaf154f6fa6c5743d3fb60c9c8b83dd83f4;hb=78fd52f682986d25fb95c171757d58384f7f58f8;hp=12612a580b17d6b71fdf25c6c0382a520db21e7b;hpb=c02a9629a834fa473d9fb709e9ca3d531c936c5e;p=gosa.git

diff --git a/plugins/admin/systems/class_servDB.inc b/plugins/admin/systems/class_servDB.inc
index 12612a580..cd716eaf1 100644
--- a/plugins/admin/systems/class_servDB.inc
+++ b/plugins/admin/systems/class_servDB.inc
@@ -9,6 +9,7 @@ class servdb extends plugin
 
   /* Object information */
   var $goImapName= "";
+  var $goImapName_old= "";
   var $goImapConnect= "";
   var $goImapAdmin= "";
   var $goImapPassword= "";
@@ -26,13 +27,17 @@ 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",
                          "goImapSieveServer", "goImapSievePort", "goKrbRealm", 
                          "goKrbAdmin", "goKrbPassword", "goFaxAdmin", "goFaxPassword",
                          "goLogAdmin", "goLogPassword", "goFonAdmin", "goFonPassword",
-                         "goFonAreaCode", "goFonCountryCode");
+                         "goFonAreaCode", "goFonCountryCode","goGlpiAdmin","goGlpiDatabase","goGlpiPassword");
   var $objectclasses= array("top", "goServer");
   var $additionaloc= array("goImapServer" => array("goImapName", "goImapConnect",
                                                 "goImapAdmin", "goImapPassword",
@@ -42,6 +47,7 @@ class servdb extends plugin
                                                 "goKrbPassword"),
                           "goFaxServer" => array("goFaxAdmin", "goFaxPassword"),
                           "goLogDBServer" => array("goLogAdmin", "goLogPassword"),
+                          "goGlpiServer" => array("goGlpiAdmin","goGlpiDatabase","goGlpiPassword"),
                           "goFonServer" => array("goFonAdmin", "goFonPassword",
                                                 "goFonAreaCode", "goFonCountryCode"));
 
@@ -56,12 +62,18 @@ class servdb extends plugin
       }
     }
 
+    /* We need to save the historical state of goImapName for later checking */
+    $this->goImapName_old= $this->goImapName;
+
     /* Always is account... */
     $this->is_account= TRUE;
   }
 
   function execute()
   {
+	/* Call parent execute */
+	plugin::execute();
+
     /* Fill templating stuff */
     $smarty= get_smarty();
 
@@ -71,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])){
@@ -118,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)){
@@ -128,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'."),
@@ -143,6 +162,10 @@ class servdb extends plugin
           $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr);
         }
       }
+      /* goKrbPassword is a must field, if goKrbServer is used as objectClass */
+      if ($this->goKrbPassword == "" ){
+        $message[]= sprintf(_("The specified kerberos password is empty."), $attr);
+      }
     }
     if (in_array("goFaxServer", $this->objectclasses)){
       if ($this->goFaxAdmin == "" || preg_match("/ /", $this->goFaxAdmin)){
@@ -161,6 +184,13 @@ class servdb extends plugin
         }
       }
     }
+    if (in_array("goImapServer", $this->objectclasses) && 
+        $this->goImapName != $this->goImapName_old) {
+      // Attribute has changed
+      if(!preg_match("/^[a-z0-9.-]+$/", $this->goImapName)) {
+        $message[]= sprintf(_("The imap name string needs to be a hostname or an IP-address."));
+      }
+    }
 
     return ($message);
   }
@@ -174,11 +204,12 @@ class servdb extends plugin
     foreach($this->objectclasses as $oc){
       $objectclasses[]= $oc;
     }
-  
+    
+    /* Move cn to sieve server */
+    $this->goImapSieveServer= $this->cn;
+    
     plugin::save();
   
-
-
     $test = $this->objectclasses;
     $tmp = array_flip($this->attrs['objectClass']);
 
@@ -205,18 +236,18 @@ class servdb extends plugin
     }
     $this->attrs = array_reverse($this->attrs);
 
-
-
     /* 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){
       if ($this->is_modified){
-        $this->handle_post_events("mofify");
+        $this->handle_post_events("modify");
       }
     } else {
       $this->handle_post_events("add");