aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2017-05-26 02:50:07 +0300
committerThomas Backlund <tmb@mageia.org>2017-05-26 02:50:07 +0300
commit8fc97191a3533a1cce0b051baa55db68d83b5dc4 (patch)
treec0b66629f4e7d987c440f16d390c86f4c0165b05
parentc5056fc16d017fed4fcfccc773fcb1d0a04d8c09 (diff)
downloadforums-8fc97191a3533a1cce0b051baa55db68d83b5dc4.tar
forums-8fc97191a3533a1cce0b051baa55db68d83b5dc4.tar.gz
forums-8fc97191a3533a1cce0b051baa55db68d83b5dc4.tar.bz2
forums-8fc97191a3533a1cce0b051baa55db68d83b5dc4.tar.xz
forums-8fc97191a3533a1cce0b051baa55db68d83b5dc4.zip
[ticket/13096] Add phpbb_ prefix to ldap_escape()
-rw-r--r--phpBB/includes/auth/auth_ldap.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index 47bc706664..f7134dca7e 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -288,7 +288,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']})";
@@ -300,7 +300,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);
}