Added conflict with kolab

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

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 924519abf698f7090e5134a91017b7c70afd36b4..427f7e842356357766f9b033119ab1a5798879ad 100644 (file)
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -17,7 +17,7 @@ class goCupsServer extends plugin{
   var $DisplayName      = "";
   var $dn               = NULL;
   var $acl;
-
+  var $cn                  = "";
   var $goCupsServerStatus  = "";
  
   function goCupsServer($config,$dn)
@@ -66,6 +66,7 @@ class goCupsServer extends plugin{
       $ldap->add($this->attrs);
     }
     show_ldap_error($ldap->get_error());
+    $this->handle_post_events("remove");
   }
 
 
@@ -82,6 +83,12 @@ class goCupsServer extends plugin{
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
+    if($this->initially_was_account){
+      $this->handle_post_events("modify");
+    }else{
+      $this->handle_post_events("add");
+    }
+
     show_ldap_error($ldap->get_error());
   }
 
@@ -142,6 +149,16 @@ class goCupsServer extends plugin{
       foreach ($add_attrs as $name => $value){
         $command= preg_replace("/%$name/", $value, $command);
       }
+
+      /* If there are still some %.. in our command, try to fill these with some other class vars */
+      if(preg_match("/%/",$command)){
+        $attrs = get_object_vars($this);
+        foreach($attrs as $name => $value){
+          if(!is_string($value)) continue;
+          $command= preg_replace("/%$name/", $value, $command);
+        }
+      }
+
       if (check_command($command)){
         @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,
             $command, "Execute");