diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-06-20 16:46:25 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-06-20 16:47:55 -0400 |
| commit | 0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1 (patch) | |
| tree | fdc1a23606262b4aca6074acf02d2cb118d19d07 /phpBB/includes/auth | |
| parent | 8214e6e8377b0858092e48aba3ba2a01994be47f (diff) | |
| download | forums-0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1.tar forums-0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1.tar.gz forums-0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1.tar.bz2 forums-0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1.tar.xz forums-0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1.zip | |
[feature/auth-refactor] Fix LDAP conversion error
I messed up when converting over auth_ldap this commit fixes that
error. I have not been able to extensively test ldap due to not
having ldap set up on this computer yet.
Apache authentication appears to work.
PHPBB3-9734
Diffstat (limited to 'phpBB/includes/auth')
| -rw-r--r-- | phpBB/includes/auth/provider_ldap.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php index 8270f50440..ee9b8100ee 100644 --- a/phpBB/includes/auth/provider_ldap.php +++ b/phpBB/includes/auth/provider_ldap.php @@ -338,11 +338,11 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface * * @return string A filter string for ldap_search */ - public function ldap_user_filter($username) + private function ldap_user_filter($username) { global $config; - $filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')'; + $filter = '(' . $config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')'; if ($config['ldap_user_filter']) { $_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})"; @@ -354,7 +354,7 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface /** * Escapes an LDAP AttributeValue */ - public function escape($string) + private function ldap_escape($string) { return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string); } |