diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-23 22:54:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-23 22:54:27 +0200 |
| commit | 2f773fca1806b7f31f9160487f9b11dc131e9f21 (patch) | |
| tree | 792dedd604247411b9c39d99b61d6d1bd744a06c | |
| parent | 8bd1853b56b78ecbf6b06dea623284514589d339 (diff) | |
| parent | ba464ec93a2707b602d212e364905a920b3b9460 (diff) | |
| download | forums-2f773fca1806b7f31f9160487f9b11dc131e9f21.tar forums-2f773fca1806b7f31f9160487f9b11dc131e9f21.tar.gz forums-2f773fca1806b7f31f9160487f9b11dc131e9f21.tar.bz2 forums-2f773fca1806b7f31f9160487f9b11dc131e9f21.tar.xz forums-2f773fca1806b7f31f9160487f9b11dc131e9f21.zip | |
Merge pull request #2989 from Senky/ticket/13096
[ticket/13096] ldap_escape() added to PHP 5.6.0
* Senky/ticket/13096:
[ticket/13096] Add phpbb_ prefix to ldap_escape()
| -rw-r--r-- | phpBB/includes/auth/auth_ldap.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index eebf147d48..63796a474b 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -282,7 +282,7 @@ function ldap_user_filter($username) { global $config; - $filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')'; + $filter = '(' . $config['ldap_uid'] . '=' . phpbb_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']})"; @@ -294,7 +294,7 @@ function ldap_user_filter($username) /** * Escapes an LDAP AttributeValue */ -function ldap_escape($string) +function phpbb_ldap_escape($string) { return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string); } |