X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=dae522f0f46ce28e24e30a023c68fe39c10701a3;hb=33295af82f6e7e0eb6881d2f4ee5eb6697eaca8a;hp=336923ac5c4b7f948779c21f6f39aa259f4b981a;hpb=3daec3e3469686f68457b992847a339c7add9bb1;p=gosa.git

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 336923ac5..dae522f0f 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -93,6 +93,7 @@ class userinfo
   function loadACL()
   {
     $this->ACL= array();    
+    $this->allACLs= array();    
     $this->groups= array();    
     $this->result_cache =array();
     $this->reset_acl_cache();
@@ -180,6 +181,7 @@ class userinfo
             if (preg_match('/^G:\*/',  $grp)){
               $interresting= TRUE;
             }
+            $this->allACLs[$dn][$idx]= $type;
           }
         }
 
@@ -189,7 +191,6 @@ class userinfo
           }
           $this->ACL[$dn][$idx]= $type;
         }
-        $this->allACLs[$dn][$idx]= $type;
       }
     }
 
@@ -364,12 +365,12 @@ class userinfo
 
     /* Check for correct category and class values... */
     if(strpos($object,'/') !== FALSE){
-      list($aclCategory, $aclClass) = split("/", $object);
+      list($aclCategory, $aclClass) = preg_split("!/!", $object);
     }else{
       $aclCategory = $object;
     }
 
-    if($this->config->get_cfg_value("displayerrors") == "true"){
+    if($this->config->get_cfg_value("displayErrors") == "true"){
         if(!isset($this->ocMapping[$aclCategory])){
             trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
             return("");
@@ -447,12 +448,6 @@ class userinfo
         /* Inspect this ACL, place the result into ACL */
         foreach ($ACL[$cpath] as $subacl){
 
-          /* Reset? Just clean the ACL and turn over to the next one... */
-          if ($subacl['type'] == 'reset'){
-            $acl= $this->cleanACL($acl, TRUE);
-            continue;
-          }
-
           if($subacl['type'] == "role") {
             echo "role skipped";
             continue;
@@ -469,6 +464,12 @@ class userinfo
             }
           }
 
+          /* Reset? Just clean the ACL and turn over to the next one... */
+          if ($subacl['type'] == 'reset'){
+            $acl= $this->cleanACL($acl, TRUE);
+            continue;
+          }
+
           /* Self ACLs? 
            */
           if($dn != $this->dn && isset($subacl['acl'][$object][0]) && (strpos($subacl['acl'][$object][0],"s") !== FALSE)){
@@ -498,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;
@@ -516,7 +523,10 @@ class userinfo
                 foreach($this->ocMapping[$ocs] as $oc){
                   if (isset($subacl['acl'][$ocs.'/'.$oc])){
 
-                    if($dn != $this->dn && strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
+                      // Skip ACLs wich are defined for ourselfs only - if not checking against ($ui->dn)
+                      if(isset($subacl['acl'][$ocs.'/'.$oc][0]) && 
+                              $dn != $this->dn && 
+                              strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
 
                     foreach($subacl['acl'][$ocs.'/'.$oc] as $attr => $dummy){
                       $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$ocs.'/'.$oc][$attr]);
@@ -734,7 +744,7 @@ class userinfo
             }
           }
         }else{
-            if($this->config->get_cfg_value("displayerrors") == "true"){
+            if($this->config->get_cfg_value("displayErrors") == "true"){
                 trigger_error("Invalid type of category ".$category);
             }
           $acl = "";