[ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.

No longer use LDAP_NO_SERVER_CONNECTION in case ldap_search() fails.
Add and use LDAP_SEARCH_FAILED instead, so users can tell the difference
between ldap_connect() failing and ldap_search() failing.

PHPBB3-8792
This commit is contained in:
Andreas Fischer 2010-05-16 23:05:13 +02:00
parent 6d7e30ae99
commit 327f9afbc0
2 changed files with 2 additions and 1 deletions

View file

@ -74,7 +74,7 @@ function init_ldap()
if ($search === false)
{
return $user->lang['LDAP_NO_SERVER_CONNECTION'];
return $user->lang['LDAP_SEARCH_FAILED'];
}
$result = @ldap_get_entries($ldap, $search);

View file

@ -295,6 +295,7 @@ $lang = array_merge($lang, array(
'LAST_VISIT' => 'Last visit',
'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not available.',
'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server.',
'LDAP_SEARCH_FAILED' => 'An error occured while searching the LDAP directory.',
'LEGEND' => 'Legend',
'LOCATION' => 'Location',
'LOCK_POST' => 'Lock post',