holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed adi's patch to allow again searching in other fields then the one used in account-filter (by default uid)

Browse Source
This commit is contained in:
Ralf Becker 2006-10-28 09:32:04 +00:00
parent a934f999e9
commit 3dcbd0ae30
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -659,10 +659,9 @@ class accounts_backend
$filter .= '(|(uid='.implode(')(uid=',$members).'))';
}
// add account_filter to filter (and make $query a wildcard if empty)
// add account_filter to filter (user has to be '*', as we otherwise only search uid's)
$filter .= $this->account_filter;
if (empty($query)) $query = '*';
$filter = str_replace(array('%user','%domain'),array($query,$GLOBALS['egw_info']['user']['domain']),$filter);
$filter = str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$filter);
$filter .= ')';
$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid','uidNumber','givenname','sn','mail','shadowExpire'));