Updated groupMail

[gosa.git] / include / class_userinfo.inc

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 337c398a79f7c8e408ce1eda0d19776690a9b692..85538a5b042a581d875caf51cee85bbe1a097699 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -24,7 +24,10 @@ class userinfo
   var $ip;
   var $username;
   var $cn;
+  var $gidNumber= -1;
+  var $language= "";
   var $config;
+  var $gosaUnitTag= "";
   var $subtreeACL= array();
 
   /* get acl's an put them into the userinfo object
@@ -32,7 +35,7 @@ class userinfo
   function userinfo($config, $userdn){
     $this->config= $config;
     $ldap= $this->config->get_ldap_link();
-    $ldap->cat($userdn);
+    $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag'));
     $attrs= $ldap->fetch();
 
     if (isset($attrs['givenName'][0]) && isset($attrs['sn'][0])){
@@ -40,6 +43,18 @@ class userinfo
     } else {
       $this->cn= $attrs['uid'][0];
     }
+    if (isset($attrs['gidNumber'][0])){
+      $this->gidNumber= $attrs['gidNumber'][0];
+    }
+
+    /* Assign user language */
+    if (isset($attrs['preferredLanguage'][0])){
+      $this->language= $attrs['preferredLanguage'][0];
+    }
+
+    if (isset($attrs['gosaUnitTag'][0])){
+      $this->gosaUnitTag= $attrs['gosaUnitTag'][0];
+    }
 
     $this->dn= $userdn;
     $this->ip= $_SERVER['REMOTE_ADDR'];
@@ -50,15 +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']);
-    $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
-        "(|(memberUid=$this->username)(cn=$this->username)))");
+    if ($this->gidNumber == -1){
+      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".$tag.
+          "(memberUid=$this->username))");
+    } else {
+      $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];