More optimizations

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

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 3a3f31979f0a4b4ad2364d1d410d2808d9d281ec..7ba77834a63a69d9e68c50027b0f85fdb5eb5651 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -322,7 +322,7 @@ class userinfo
     foreach ($path as $element){
 
       /* Clean potential ACLs for each level */
-      if(in_array($cpath,$this->config->departments)){
+                       if(isset($this->config->idepartments[$cpath])){
         $acl= $this->cleanACL($acl);
       }
 
@@ -395,7 +395,7 @@ class userinfo
     /* If the requested ACL is for a container object, then alter 
         ACLs by applying cleanACL a last time.
      */
-    if(in_array($dn,$this->config->departments)){
+    if(isset($this->config->idepartments[$dn])){
       $acl = $this->cleanACL($acl);
     }
 
@@ -445,11 +445,7 @@ class userinfo
 
       $deps = array();
 
-#      /* Search for per object ACLs. 
-#       */
-#      $this->config->get_departments();
-#      $this->config->make_idepartments();
-
+      /* Search for per object ACLs */
       foreach($this->ACL as $dn => $infos){
         foreach($infos as $info){
           $found = FALSE;