aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJakub Senko <jakubsenko@gmail.com>2014-09-23 22:43:52 +0200
committerJakub Senko <jakubsenko@gmail.com>2014-09-23 22:43:52 +0200
commitba464ec93a2707b602d212e364905a920b3b9460 (patch)
tree792dedd604247411b9c39d99b61d6d1bd744a06c /phpBB/includes
parent8bd1853b56b78ecbf6b06dea623284514589d339 (diff)
downloadforums-ba464ec93a2707b602d212e364905a920b3b9460.tar
forums-ba464ec93a2707b602d212e364905a920b3b9460.tar.gz
forums-ba464ec93a2707b602d212e364905a920b3b9460.tar.bz2
forums-ba464ec93a2707b602d212e364905a920b3b9460.tar.xz
forums-ba464ec93a2707b602d212e364905a920b3b9460.zip
[ticket/13096] Add phpbb_ prefix to ldap_escape()
PHPBB3-13096
Diffstat (limited to 'phpBB/includes')
-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 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);
}