From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 29 Oct 2008 09:59:14 +0000 (+0000)
Subject: Updated ACL modification
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=19a17f8e133536cd1cc70a6ff8434e608a110fdf;p=gosa.git

Updated ACL modification
-The last object ACLs wasn't removed.


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

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 0ddb62128..f0b2af9ce 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -308,7 +308,6 @@ class acl extends plugin
 
       /* ACL saving... */
       if (preg_match('/^acl_.*_[^xy]$/', $name)){
-        $aclDialog= TRUE;
         list($dummy, $object, $attribute, $value)= split('_', $name);
 
         /* Skip for detection entry */
@@ -333,6 +332,10 @@ class acl extends plugin
       }
     }
 
+    if(isset($_POST['acl_dummy_0_0_0'])){
+      $aclDialog= TRUE;
+    }
+
     if($this->acl_is_writeable("")){
       
       /* Only be interested in new acl's, if we're in the right _POST place */
@@ -342,6 +345,7 @@ class acl extends plugin
 
           if(isset($this->aclContents[$oc]) && is_array($this->aclContents)){
             unset($this->aclContents[$oc]);
+          }elseif(isset($this->aclContents[$this->aclObject.'/'.$oc]) && is_array($this->aclContents)){
             unset($this->aclContents[$this->aclObject.'/'.$oc]);
           }else{
 #          trigger_error("Huhm?");