Updated serverService : Set acl base/category for services

[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..af31f680942094c347bf72079dbc35491f06753e 100644 (file)
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -8,7 +8,7 @@ class goCupsServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goCupsServer");
-  var $attributes       = array("goCupsServerStatus");
+  var $attributes       = array();
   var $StatusFlag       = "goCupsServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */
@@ -17,7 +17,7 @@ class goCupsServer extends plugin{
   var $DisplayName      = "";
   var $dn               = NULL;
   var $acl;
-
+  var $cn                  = "";
   var $goCupsServerStatus  = "";
  
   function goCupsServer($config,$dn)
@@ -40,6 +40,7 @@ class goCupsServer extends plugin{
 
   function getListEntry()
   {
+    $this->updateStatusState();
     $flag = $this->StatusFlag;
     $fields['Status']     = $this->$flag;
     $fields['Message']    = _("Print service");
@@ -55,6 +56,13 @@ class goCupsServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));
@@ -65,7 +73,8 @@ class goCupsServer extends plugin{
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of server services/cups with dn '%s' failed."),$this->dn));
+    $this->handle_post_events("remove");
   }
 
 
@@ -82,7 +91,13 @@ class goCupsServer extends plugin{
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error());
+    if($this->initially_was_account){
+      $this->handle_post_events("modify");
+    }else{
+      $this->handle_post_events("add");
+    }
+
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of server services/cups with dn '%s' failed."),$this->dn));
   }
 
 
@@ -104,7 +119,7 @@ class goCupsServer extends plugin{
       $attrs[$flag] = $value;
       $this->$flag = $value;
       $ldap->modify($attrs);
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for server services/cups with dn '%s' failed."),$this->dn));
       $this->action_hook();
     }
   }
@@ -142,6 +157,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");
@@ -155,6 +180,42 @@ class goCupsServer extends plugin{
   }
 
 
+  /* Get updates for status flag */
+  function updateStatusState()
+  {
+    if(empty($this->StatusFlag)) return;
+
+    $attrs = array();
+    $flag = $this->StatusFlag;
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($this->cn);
+    $ldap->cat($this->dn,array($flag));
+    if($ldap->count()){
+      $attrs = $ldap->fetch();
+    }
+    if(isset($attrs[$flag][0])){
+      $this->$flag = $attrs[$flag][0];
+    }
+  }
+
+
+  /* Return plugin informations for acl handling */
+  function plInfo()
+  {
+    return (array(
+          "plShortName"   => _("Cups"),
+          "plDescription" => _("Cups service"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("administration"),
+          "plCategory"    => array("server"),
+
+          "plProvidedAcls"=> array()
+          ));
+  }
+
+
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>