début amélioration LDAP

This commit is contained in:
Regis Houssin 2006-06-12 14:55:44 +00:00
parent 4fc5818a34
commit 6871f7c3ad
2 changed files with 4 additions and 8 deletions

View File

@ -313,7 +313,7 @@ if (function_exists("ldap_connect"))
// Test ldap_unbind // Test ldap_unbind
$unbind = $ldap->dolibarr_ldap_unbind($ds); $unbind = $ldap->dolibarr_ldap_unbind($ds);
if ($unbind) if ($bind && $unbind)
{ {
print img_picto('','info'); print img_picto('','info');
print "Déconnection du dn $dn réussi<br>"; print "Déconnection du dn $dn réussi<br>";

View File

@ -70,12 +70,8 @@ function dolibarr_ldap_connect()
if ($ldapconnect) if ($ldapconnect)
{ {
ldap_set_option($ldapconnect, LDAP_OPT_PROTOCOL_VERSION, $conf->global->LDAP_SERVER_PROTOCOLVERSION); ldap_set_option($ldapconnect, LDAP_OPT_PROTOCOL_VERSION, $conf->global->LDAP_SERVER_PROTOCOLVERSION);
return $ldapconnect;
}
else
{
$this->err = ldap_error($ldapconnect);
} }
return $ldapconnect;
} }
@ -90,7 +86,7 @@ function dolibarr_ldap_bind($ds)
if (defined("LDAP_ADMIN_PASS") && $conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS) if (defined("LDAP_ADMIN_PASS") && $conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS)
{ {
$ldapbind = ldap_bind($ds, $conf->global->LDAP_ADMIN_DN, $conf->global->LDAP_ADMIN_PASS); $ldapbind = @ldap_bind($ds, $conf->global->LDAP_ADMIN_DN, $conf->global->LDAP_ADMIN_PASS);
} }
if ($ldapbind) if ($ldapbind)
@ -110,7 +106,7 @@ function dolibarr_ldap_bind($ds)
*/ */
function dolibarr_ldap_unbind($ds) function dolibarr_ldap_unbind($ds)
{ {
$ldapunbind = ldap_unbind($ds); $ldapunbind = @ldap_unbind($ds);
return $ldapunbind; return $ldapunbind;
} }