Fixed handling of admin@localhost.

[timetracker.git] / WEB-INF / lib / auth / Auth_ldap.class.php

diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 0001f29..e17b6e7 100644 (file)
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -53,10 +53,9 @@ class Auth_ldap extends Auth {
 
   function __construct($params)
   {
+    global $smarty;
     $this->params = $params;
-    if (isset($GLOBALS['smarty'])) {
-      $GLOBALS['smarty']->assign('Auth_ldap_params', $this->params);
-    }
+    $smarty->assign('Auth_ldap_params', $this->params);
   }
 
   function ldap_escape($str){
@@ -140,7 +139,7 @@ class Auth_ldap extends Auth {
         // Get groups the user is a member of from AD LDAP server.
 
         $filter = 'userPrincipalName='.Auth_ldap::ldap_escape($login);
-        $fields = array('samaccountname', 'mail', 'memberof', 'department', 'displayname', 'telephonenumber', 'primarygroupid');
+        $fields = array('memberof');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
         if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {