extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

added configurable search-filter to auth_ldap

Browse Source
This commit is contained in:
Ralf Becker 2004-08-21 12:18:07 +00:00
parent c7e6cb74fa
commit 508cff860c
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
phpgwapi/inc/class.auth_ldap.inc.php
View File

@ -55,13 +55,13 @@
} }
/* find the dn for this uid, the uid is not always in the dn */ /* find the dn for this uid, the uid is not always in the dn */
$attributes = array('uid','dn','givenName','sn','mail','uidNumber','gidNumber'); $attributes = array('uid','dn','givenName','sn','mail','uidNumber','gidNumber');
$filter = $GLOBALS['phpgw_info']['server']['ldap_search_filter'] ? $GLOBALS['phpgw_info']['server']['ldap_search_filter'] : '(uid=%user)';
$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['phpgw_info']['user']['domain']),$filter);
if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap') if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')
{ {
$filter = "(&(uid=$username)(phpgwaccountstatus=A))"; $filter = "(&$filter(phpgwaccountstatus=A))";
}
else
{
$filter = "(uid=$username)";
} }
$sri = ldap_search($ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $attributes); $sri = ldap_search($ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $attributes);
@ -123,11 +123,17 @@
{ {
if ('' == $_account_id) if ('' == $_account_id)
{ {
$_account_id = $GLOBALS['phpgw_info']['user']['account_id']; $username = $GLOBALS['phpgw_info']['user']['account_lid'];
} }
else
{
$username = $GLOBALS['phpgw']->accounts->id2name($_account_id);
}
$filter = $GLOBALS['phpgw_info']['server']['ldap_search_filter'] ? $GLOBALS['phpgw_info']['server']['ldap_search_filter'] : '(uid=%user)';
$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['phpgw_info']['user']['domain']),$filter);
$ds = $GLOBALS['phpgw']->common->ldapConnect(); $ds = $GLOBALS['phpgw']->common->ldapConnect();
$sri = ldap_search($ds, $GLOBALS['phpgw_info']['server']['ldap_context'], 'uidnumber=' . (int)$_account_id); $sri = ldap_search($ds, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter);
$allValues = ldap_get_entries($ds, $sri); $allValues = ldap_get_entries($ds, $sri);
$entry['userpassword'] = $this->encrypt_password($new_passwd); $entry['userpassword'] = $this->encrypt_password($new_passwd);
@ -144,17 +150,30 @@
function update_lastlogin($_account_id, $ip) function update_lastlogin($_account_id, $ip)
{ {
$entry['phpgwaccountlastlogin'] = time(); if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')
$entry['phpgwaccountlastloginfrom'] = $ip; {
$entry['phpgwaccountlastlogin'] = time();
$entry['phpgwaccountlastloginfrom'] = $ip;
$ds = $GLOBALS['phpgw']->common->ldapConnect(); $ds = $GLOBALS['phpgw']->common->ldapConnect();
$sri = ldap_search($ds, $GLOBALS['phpgw_info']['server']['ldap_context'], 'uidnumber=' . (int)$_account_id); $sri = ldap_search($ds, $GLOBALS['phpgw_info']['server']['ldap_context'], 'uidnumber=' . (int)$_account_id);
$allValues = ldap_get_entries($ds, $sri); $allValues = ldap_get_entries($ds, $sri);
$dn = $allValues[0]['dn']; $dn = $allValues[0]['dn'];
$this->previous_login = $allValues[0]['phpgwaccountlastlogin'][0]; $this->previous_login = $allValues[0]['phpgwaccountlastlogin'][0];
@ldap_modify($ds, $dn, $entry); @ldap_modify($ds, $dn, $entry);
}
else
{
$GLOBALS['phpgw']->db->query("select account_lastlogin from phpgw_accounts where account_id='$account_id'",__LINE__,__FILE__);
$GLOBALS['phpgw']->db->next_record();
$this->previous_login = $GLOBALS['phpgw']->db->f('account_lastlogin');
$GLOBALS['phpgw']->db->query("update phpgw_accounts set account_lastloginfrom='"
. "$ip', account_lastlogin='" . time()
. "' where account_id='$account_id'",__LINE__,__FILE__);
}
} }
} }
?> ?>