From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 20 Jun 2008 08:06:19 +0000 (+0000)
Subject: Updated ACL management.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=88983bbfc52dce0f1388ece442c127a676623b31;p=gosa.git

Updated ACL management.
-You can now remove multiple roles.


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

diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc
index 0d1009f48..7aeab21ce 100644
--- a/gosa-core/plugins/admin/acl/class_aclManagement.inc
+++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc
@@ -291,6 +291,7 @@ class aclManagement extends plugin
       $this->remove_lock();
     }
 
+
     /********************
       Delete entry requested, display confirm dialog
      ********************/
@@ -362,23 +363,29 @@ class aclManagement extends plugin
     /* Confirmation for deletion has been passed. Acl should be deleted. */
     if (isset($_POST['delete_acl_confirm'])){
 
-      /* Check permissions */
-      if(preg_match("/d/",$this->ui->get_permissions($this->dn,"aclroles/aclrole"))){
 
-        /* Delete request is permitted, perform LDAP action */
-        $this->acltabs= new acl($this->config, NULL,$this->dn);
-        $this->acltabs->remove_from_parent();
-        unset ($this->acltabs);
-        $this->acltabs= NULL;
-      } else {
+      foreach($this->dns as $dn){
+      
+        $this->dn = $dn;
 
-        /* Normally this shouldn't be reached, send some extra
-           logs to notify the administrator */
-        msg_dialog::display(_("Permission error"),msgPool::permDelete(), ERROR_DIALOG);
+        /* Check permissions */
+        if(preg_match("/d/",$this->ui->get_permissions($this->dn,"aclroles/aclrole"))){
 
-        if(isset($this->ui->uid)){
-          new log("security","aclroles/".get_class($this),$this->dn,array(),"Warning: '".$this->ui->uid."' tried to trick acl role      deletion.");
-          
+          /* Delete request is permitted, perform LDAP action */
+          $this->acltabs= new aclrole($this->config, $this->dn);
+          $this->acltabs->remove_from_parent();
+          unset ($this->acltabs);
+          $this->acltabs= NULL;
+        } else {
+
+          /* Normally this shouldn't be reached, send some extra
+             logs to notify the administrator */
+          msg_dialog::display(_("Permission error"),msgPool::permDelete(), ERROR_DIALOG);
+
+          if(isset($this->ui->uid)){
+            new log("security","aclroles/".get_class($this),$this->dn,array(),"Warning: '".$this->ui->uid."' tried to trick acl role      deletion.");
+
+          }
         }
       }