extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed account-enabled check for account-storage != ldap

Browse Source
This commit is contained in:
Ralf Becker 2003-09-24 12:21:38 +00:00
parent d0d9dc1721
commit 54bcb34236
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,14 @@
} }
/* 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" ); $attributes = array( "uid", "dn" );
$filter = "(&(uid=$username)(phpgwaccountstatus=A))"; if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')
{
$filter = "(&(uid=$username)(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);
$allValues = ldap_get_entries($ldap, $sri); $allValues = ldap_get_entries($ldap, $sri);
if ($allValues['count'] > 0) if ($allValues['count'] > 0)
@ -74,6 +81,12 @@
/* try to bind as the user with user suplied password */ /* try to bind as the user with user suplied password */
if (@ldap_bind($ldap, $userDN, $passwd)) if (@ldap_bind($ldap, $userDN, $passwd))
{ {
if ($GLOBALS['phpgw_info']['server']['account_repository'] != 'ldap')
{
$account = CreateObject('phpgwapi.accounts',$username,'u');
$data = $account->read_repository();
return $data['status'] == 'A';
}
return True; return True;
} }
} }