From 0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 20 Jun 2013 16:46:25 -0400
Subject: [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
---
 phpBB/includes/auth/provider_ldap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/auth')

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);
 	}
-- 
cgit v1.2.1