From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 28 Sep 2006 03:32:34 +0000 (+0000)
Subject: Fixed acls for ws
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=206e0e7618718e0dfb741e80e49560a4976e713f;p=gosa.git

Fixed acls for ws


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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index b61573302..94d08ba4e 100644
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -124,6 +124,19 @@ class workgeneric extends plugin
     $this->orig_dn= $this->dn;
   }
 
+
+  function set_acl_base($base)
+  {
+    plugin::set_acl_base($base);
+    $this->netConfigDNS->set_acl_base($base);
+  }
+
+  function set_acl_category($cat)
+  {
+    plugin::set_acl_category($cat);
+    $this->netConfigDNS->set_acl_category($cat);
+  }
+
   function execute()
   {
     /* Call parent execute */
@@ -303,21 +316,24 @@ class workgeneric extends plugin
 
   function remove_from_parent()
   {
-    $this->netConfigDNS->remove_from_parent();
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error(), sprintf(_("Removing of system workstation/generic with dn '%s' failed."),$this->dn));
-
-    /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
-
-    /* Delete references to object groups */
-    $ldap->cd ($this->config->current['BASE']);
-    $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".$this->dn."))", array("cn"));
-    while ($ldap->fetch()){
-      $og= new ogroup($this->config, $ldap->getDN());
-      unset($og->member[$this->dn]);
-      $og->save ();
+    if($this->acl_is_removeable()){
+
+      $this->netConfigDNS->remove_from_parent();
+      $ldap= $this->config->get_ldap_link();
+      $ldap->rmdir($this->dn);
+      show_ldap_error($ldap->get_error(), sprintf(_("Removing of system workstation/generic with dn '%s' failed."),$this->dn));
+
+      /* Optionally execute a command after we're done */
+      $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
+
+      /* Delete references to object groups */
+      $ldap->cd ($this->config->current['BASE']);
+      $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".$this->dn."))", array("cn"));
+      while ($ldap->fetch()){
+        $og= new ogroup($this->config, $ldap->getDN());
+        unset($og->member[$this->dn]);
+        $og->save ();
+      }
     }
   }