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 4d21c9cb3737f100ec1e1d0e9da36555fb50a9e8..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("core","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]);
                     }
                 }
@@ -375,7 +373,7 @@ class userinfo
         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("");
         }
@@ -764,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);
   }