From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 23 Jun 2008 07:47:14 +0000 (+0000)
Subject: Updated ACL check.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd2b9f675061556c01a05bf825d0b2b825356a5f;p=gosa.git

Updated ACL check.
-Added comments.


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

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 68df16329..83db453bf 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -368,7 +368,9 @@ class userinfo
             continue;
           }
 
-          /* If attribute is "", we want to know, if we've *any* permissions here... */
+          /* If attribute is "", we want to know, if we've *any* permissions here... 
+              Merge global class ACLs [0] with attributes specific ACLs [attribute].
+           */
           if ($attribute == "" && isset($subacl['acl'][$object])){
             foreach($subacl['acl'][$object] as $attr => $dummy){
               $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$object][$attr]);
@@ -506,7 +508,7 @@ class userinfo
       $acl = "";
       foreach($module as $mod){
         if(preg_match("/\//",$mod)){
-          $acl.=  $this->get_permissions($dn,$mod,"0");
+          $acl.=  $this->get_permissions($dn,$mod);
         }else{
           $acl.=  $this->get_category_permissions($dn,$mod);
         }