From: hickert Date: Fri, 23 Apr 2010 13:13:30 +0000 (+0000) Subject: Fixed problems with the acl removal.. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2173e9b6d0fa21a89115a86029060b56f07a39e2;p=gosa.git Fixed problems with the acl removal.. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17822 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc index 26ca752f6..e7f93e01a 100644 --- a/gosa-core/include/class_management.inc +++ b/gosa-core/include/class_management.inc @@ -288,7 +288,7 @@ class management // Check permissons for each target $h = $this->getHeadpage(); - $oTypes = $h->objectTypes; + $oTypes = array_reverse($h->objectTypes); foreach($target as $dn){ $entry = $h->getEntry($dn); $obj = $h->getObjectType($oTypes, $entry['objectClass']); @@ -361,7 +361,7 @@ class management // Check permissons for each target $h = $this->getHeadpage(); - $oTypes = $h->objectTypes; + $oTypes = array_reverse($h->objectTypes); foreach($this->dns as $key => $dn){ $entry = $h->getEntry($dn); $obj = $h->getObjectType($oTypes, $entry['objectClass']); diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 8a8a7756c..a6eae23dc 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -79,15 +79,15 @@ class aclManagement extends management if($headpage->getType($dn) == "gosaRole"){ $tabClass = "aclroletab"; - $tabTape = "ACLROLETAB"; + $tabType = "ACLROLETAB"; }else{ $tabClass = "acltab"; - $tabTape = "ACLTAB"; + $tabType = "ACLTAB"; } // Delete the object $this->dn = $dn; - $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory, true, true); + $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, 'acl', true, true); $this->tabObject->set_acl_base($this->dn); $this->tabObject->delete (); $this->tabObject->parent = &$this;