Changed attribute name 'gosaLastSystemLogin' to 'gotoLastSystemLogin'.

[gosa.git] / include / class_userinfo.inc

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 77003f9e706d8bfeb1571e87f51aba54d3808492..85538a5b042a581d875caf51cee85bbe1a097699 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -65,20 +65,27 @@ class userinfo
   {
     $ldap= $this->config->get_ldap_link();
 
+    /* Check if we should include the unittag */
+    $tag= "";
+    if ($this->gosaUnitTag != "" && isset($this->config->current['STRICT_UNITS']) &&
+        preg_match('/TRUE/i', $this->config->current['STRICT_UNITS'])){
+      $tag= "(gosaUnitTag=".$this->gosaUnitTag.")";
+    }
+
     /* Load ACL's from all groups we're in */
     $this->subtreeACL= array();
     $ldap->cd($this->config->current['BASE']);
     if ($this->gidNumber == -1){
-      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
+      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".$tag.
           "(memberUid=$this->username))");
     } else {
-      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
+      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".$tag.
           "(|(memberUid=$this->username)(gidNumber=$this->gidNumber)))");
     }
 
     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];