X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=615b49fcb49bb01581d63ed7cd36d8f9d54f954d;hb=c9bd6c4d92532063a9dd8df3cfd20740d43e5841;hp=517ca272dbf01ee832a0877cdf991b573ee10f0e;hpb=e81ad6dc906342ec8a8a5e9c232cbee4178e92ee;p=gosa.git

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 517ca272d..615b49fcb 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -77,7 +77,7 @@ class userinfo
     $this->uid= $attrs['uid'][0];
     $this->ip= $_SERVER['REMOTE_ADDR'];
 
-    $this->ignoreACL = ($this->config->get_cfg_value("ignoreAcl") == $this->dn);
+    $this->ignoreACL = ($this->config->get_cfg_value("core","ignoreAcl") == $this->dn);
 
     /* Initialize ACL_CACHE */
     $this->reset_acl_cache();
@@ -370,7 +370,7 @@ class userinfo
       $aclCategory = $object;
     }
 
-    if($this->config->get_cfg_value("displayerrors") == "true"){
+    if($this->config->get_cfg_value("core","displayErrors") == "true"){
         if(!isset($this->ocMapping[$aclCategory])){
             trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
             return("");
@@ -499,6 +499,12 @@ class userinfo
           }
 
           /* Global ACL? */
+          if (isset($subacl['acl']['all/all'][0])){
+            $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all/all'][0]);
+            continue;
+          }
+
+          /* Global ACL? - Old style global ACL - Was removed since class_core.inc was created */
           if (isset($subacl['acl']['all'][0])){
             $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all'][0]);
             continue;
@@ -738,7 +744,7 @@ class userinfo
             }
           }
         }else{
-            if($this->config->get_cfg_value("displayerrors") == "true"){
+            if($this->config->get_cfg_value("core","displayErrors") == "true"){
                 trigger_error("Invalid type of category ".$category);
             }
           $acl = "";