[Phpbb-checkins] r9783 - /branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php

[Chris S. <too...@ph...>]

Author: toonarmy
Date: Sat Jul 18 21:20:20 2009
New Revision: 9783

Log:
Fix #45315

Modified:
    branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php

Modified: branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php Sat Jul 18 21:20:20 2009
***************
*** 281,287 ****
  	$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
  	if ($config['ldap_user_filter'])
  	{
! 		$filter = "(&$filter({$config['ldap_user_filter']}))";
  	}
  	return $filter;
  }
--- 281,288 ----
  	$filter = '(' . $config['ldap_uid'] . '=' . 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']})";
! 		$filter = "(&{$filter}{$_filter})";
  	}
  	return $filter;
  }