Backport from trunk

[gosa.git] / gosa-core / include / class_userinfo.inc

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index fefdb397c5036d6e11f523b91264ec66b02ad3df..d16d8658061a3b88e9f37c96e3f1e6e597b4c41b 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -37,7 +37,7 @@ class userinfo
   var $ocMapping= array();
   var $groups= array();
   var $result_cache =array();
-  var $ignoreACL = FALSE;
+  var $ignoreACL = NULL;
   var $ACLperPath = array();
   var $ACLperPath_usesFilter = array();
 
@@ -77,8 +77,6 @@ class userinfo
     $this->uid= $attrs['uid'][0];
     $this->ip= $_SERVER['REMOTE_ADDR'];
 
-    $this->ignoreACL = ($this->config->get_cfg_value("ignoreAcl") == $this->dn);
-
     /* Initialize ACL_CACHE */
     $this->reset_acl_cache();
   }
@@ -173,7 +171,7 @@ class userinfo
             }
 
             /* User inside the members? */
-            if (preg_replace('/^U:/', '', $grp) == $this->dn){
+            if (mb_strtoupper(preg_replace('/^U:/', '', $grp)) == mb_strtoupper($this->dn)){
               $interresting= TRUE;
             }
 
@@ -229,7 +227,7 @@ class userinfo
              */
             if(isset($acl_set['acl'])){ 
                 foreach($acl_set['acl'] as $object => $object_acls){
-                    if(isset($object_acls[0]) && strpos($object_acls[0],"s")){
+                    if(isset($object_acls[0]) && strpos($object_acls[0],"s") !== FALSE){
                         unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
                     }
                 }
@@ -365,20 +363,21 @@ 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->boolValueIsTrue("core","developmentMode")){
+
         if(!isset($this->ocMapping[$aclCategory])){
             trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
             return("");
-        }elseif(isset($aclClass) && !in_array($aclClass, $this->ocMapping[$aclCategory])){
+        }elseif(isset($aclClass) && !in_array_strict($aclClass, $this->ocMapping[$aclCategory])){
             trigger_error("Invalid ACL class '".$aclClass."'! ({$object})");
             return("");
         }
-        if(isset($aclClass) &&class_available($aclClass)){
+        if(isset($aclClass) && $aclClass != '0' && class_available($aclClass)){
             $plInfo = call_user_func(array($aclClass, 'plInfo'));
             if(!empty($attribute) && !isset($plInfo['plProvidedAcls'][$attribute])){
                 trigger_error("Invalid ACL attribute '".$attribute."'! ({$object})");
@@ -499,6 +498,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;
@@ -517,7 +522,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]);
@@ -735,7 +743,7 @@ class userinfo
             }
           }
         }else{
-            if($this->config->get_cfg_value("displayerrors") == "true"){
+            if($this->config->boolValueIsTrue("core","developmentMode")){
                 trigger_error("Invalid type of category ".$category);
             }
           $acl = "";
@@ -754,6 +762,9 @@ class userinfo
    */ 
   function ignore_acl_for_current_user()
   {
+    if($this->ignoreACL === NULL){
+        $this->ignoreACL = ($this->config->get_cfg_value("core","ignoreAcl") == $this->dn);
+    }
     return($this->ignoreACL);
   }