mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

[feature/auth-refactor] Make LDAP consistent with interface

Browse Source 
Makes the provider_ldap consistent with the provider_interface
except for the acp() method which has not yet been finalized.
Renames phpbb_auth_provider_ldap::user_filter to
phpbb_auth_provider_ldap::ldap_user_filter to maintain the original
name of the function from auth_ldap.

PHPBB3-9734
This commit is contained in:
Joseph Warner 2013-06-18 15:57:31 -04:00
parent 57689948e2
commit 204c640c77
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/includes/auth/provider_ldap.php
View File

@ -68,7 +68,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
$search = @ldap_search(
$ldap,
htmlspecialchars_decode($config['ldap_base_dn']),
ldap_user_filter($user->data['username']),
$this->ldap_user_filter($user->data['username']),
(empty($config['ldap_email'])) ?
array(htmlspecialchars_decode($config['ldap_uid'])) :
array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
@ -102,7 +102,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
/**
* Login function
*/
public function login(&$username, &$password)
public function login($username, $password)
{
global $db, $config, $user;
@ -171,7 +171,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
$search = @ldap_search(
$ldap,
htmlspecialchars_decode($config['ldap_base_dn']),
ldap_user_filter($username),
$this->ldap_user_filter($username),
(empty($config['ldap_email'])) ?
array(htmlspecialchars_decode($config['ldap_uid'])) :
array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
@ -275,7 +275,10 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
);
}
public function autologin();
public function autologin()
{
return;
}
/**
* This function is used to output any required fields in the authentication
@ -335,7 +338,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
*
* @return string A filter string for ldap_search
*/
public function user_filter($username)
public function ldap_user_filter($username)
{
global $config;