Updated ACL detection.

- There was a hard coded ou= inside the regex, but we may have an empty group container object defined. groups=""

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

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 0715c700889cf8fd52a10fc31f1bb2d79a4b5705..85538a5b042a581d875caf51cee85bbe1a097699 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -84,8 +84,8 @@ class userinfo
     }
 
     while($attrs = $ldap->fetch()){
-      $base= preg_replace('/^[^,]+,ou=[^,]+,/i', "",$ldap->getDN());
-      $base= preg_replace("/[ ]*,[ ]*/", ",", $base);
+      $base= preg_replace('/^[^,]*+,'.normalizePreg(get_groups_ou()).'/i', "",$ldap->getDN());
+      $base= preg_replace("/\s*,\s*/", ",", $base);
 
       for ($i= 0; $i<$attrs["gosaSubtreeACL"]["count"]; $i++){
         $this->subtreeACL[$base][]= $attrs["gosaSubtreeACL"][$i];