Set workstation mac for printer too

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

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 4145f5525dd6e45a2e3ff96cc222b105d795b362..901133c6216a60096187c842c51a67dd1444ded6 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -26,9 +26,6 @@ class servkolab extends plugin {
   var $proftpd_ftp                      = "TRUE";
   var $apache_http                      = "TRUE";
   var $kolabHost                        = array();
-  var $is_in_there                      = false;
-  var $exactName                        = false;
-
   var $orig_cn                          = "";
 
   var $attributes =  array("postfix_mydomain", "postfix_mydestination", "proftpd_ftp", "k",
@@ -64,38 +61,15 @@ class servkolab extends plugin {
       $this->kolabHost= $this->attrs['kolabHost'];
       unset($this->kolabHost['count']);
     }
-    $this->is_in_there           = false;
     $this->is_account            = false;
     $this->initially_was_account = false;
     foreach($this->kolabHost as $host){
-      if(preg_match("/".$this->hostname.".*/i",$host)){
+      if($this->hostname == $host){
         $this->is_account            = true;
-        $this->is_in_there           = true;
         $this->initially_was_account = true;
       }
     } 
 
-
-    /* Mhh */ 
-    if(in_array($this->hostname, $this->kolabHost)) {
-      $this->exactName=true;
-    } else {   
-      $this->exactName=false;    
-    } 
-
-    /* Parse mynetworks */
-    if(isset($this->attrs['postfix-mynetworks'])){
-      if(is_array($this->attrs['postfix-mynetworks'])){  
-        unset($this->attrs['postfix-mynetworks']['count']);
-        $tmp="";
-        foreach($this->attrs['postfix-mynetworks'] as $tm){
-          $tmp.=$tm.";";
-        }
-        $this->postfix_mynetworks = $tmp;
-      }
-    }else{
-      $this->postfix_mynetworks="";
-    }
   }
 
 
@@ -327,26 +301,15 @@ class servkolab extends plugin {
             $tmp[] = $host;
           }
         }
+        $this->kolabHost = $tmp;
       }
-      $this->kolabHost = $tmp;
     }
-    
+
     /* Add ourselves to the list of kolabHost's if needed */
-    if (!in_array($this->cn,$this->kolabHost)){
+    if (!in_array_ics($this->cn,$this->kolabHost)){
       $this->kolabHost[]= $this->cn;
     }
 
-    /* Create mynetworks array by splitting the string with ; */
-    $tmp = split(";",$this->postfix_mynetworks);
-    $this->postfix_mynetworks = array();
-    foreach($tmp as $tm){
-      trim($tm);
-      if(!empty($tm)){
-        $this->postfix_mynetworks[]=$tm;
-      }
-    }
-    $this->attrs['postfix_mynetworks']=$this->postfix_mynetworks;
-
     /* Call parents save to prepare $this->attrs */
     plugin::save();
 
@@ -370,10 +333,6 @@ class servkolab extends plugin {
     /* Add kolab hosts */
     $this->attrs['kolabHost']= $this->kolabHost;
 
-    if(($this->is_in_there)&&(!$this->exactName)){
-      unset($this->attrs['kolabHost']);
-    }
-
     /* Perform LDAP action */
     $ldap->cd($this->dn);
     $this->cleanup();;