Some changes for glpi

[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 316089bd9d94ff7422a17f901a80c8398cb7dcd5..2ee9f873de7001fedb1e3852cd3d82533e282cd2 100644 (file)
--- a/plugins/admin/systems/class_servDB.inc
+++ b/plugins/admin/systems/class_servDB.inc
@@ -27,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",
@@ -43,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"));
 
@@ -66,6 +71,9 @@ class servdb extends plugin
 
   function execute()
   {
+       /* Call parent execute */
+       plugin::execute();
+
     /* Fill templating stuff */
     $smarty= get_smarty();
 
@@ -124,6 +132,14 @@ class servdb extends plugin
   {
     $message= array();
 
+    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)){
       foreach (array("goImapAdmin", "goImapName") as $attr){
@@ -132,6 +148,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'."),
@@ -147,6 +164,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)){
@@ -168,7 +189,7 @@ 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)) {
+      if(!preg_match("/^[a-z0-9.-]+$/", $this->goImapName)) {
         $message[]= sprintf(_("The imap name string needs to be a hostname or an IP-address."));
       }
     }
@@ -185,11 +206,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']);