From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 19 May 2006 06:47:03 +0000 (+0000)
Subject: 3. updated Koalb host
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06e89209cd1dc7a8910b0831c804c7e52ed51221;p=gosa.git

3. updated Koalb host


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

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 4145f5525..d6a30a0e9 100644
--- 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,25 +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'])){  
@@ -327,12 +314,12 @@ 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;
     }
 
@@ -370,10 +357,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();;