diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 63b8b2e0d8f..27a84a5dedb 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -277,9 +277,9 @@ if (function_exists("ldap_connect")) print "
"; } - // Test ldap_getversion if ($ds) { + // Test ldap_getversion if ((dolibarr_ldap_getversion($ds) == 3)) { print img_picto('','info'); @@ -290,37 +290,37 @@ if (function_exists("ldap_connect")) print img_picto('','info'); print $langs->trans("LDAPSetupForVersion2").'
'; } - } - // Test ldap_bind - $bind = @dolibarr_ldap_bind($ds); - if ($bind) - { - print img_picto('','info'); - print "Connexion au dn $dn réussi
"; - } - else - { - print img_picto('','alerte'); - - print "Connexion au dn $dn raté : "; - print ldap_error($ds); - print "
"; - } + // Test ldap_bind + $bind = @dolibarr_ldap_bind($ds); + + if ($bind) + { + print img_picto('','info'); + print "Connexion au dn $dn réussi
"; + } + else + { + print img_picto('','alerte'); + print "Connexion au dn $dn raté : "; + print $bind->err; + print "
"; + } - // Test ldap_unbind - $unbind = @dolibarr_ldap_unbind($ds); - if ($bind) - { - print img_picto('','info'); - print "Déconnection du dn $dn réussi
"; - } - else - { - print img_picto('','alerte'); - - print "Déconnection du dn $dn raté"; - print "
"; + // Test ldap_unbind + $unbind = @dolibarr_ldap_unbind($ds); + + if ($bind) + { + print img_picto('','info'); + print "Déconnection du dn $dn réussi
"; + } + else + { + print img_picto('','alerte'); + print "Déconnection du dn $dn raté"; + print "
"; + } } } } diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php index 025ade58e17..c2d6c8dafb4 100644 --- a/htdocs/lib/ldap.lib.php +++ b/htdocs/lib/ldap.lib.php @@ -61,7 +61,7 @@ function dolibarr_ldap_connect() } else { - $this->err .= ldap_error($ldapconnect); + $this->err = ldap_error($ldapconnect); } } @@ -79,8 +79,15 @@ function dolibarr_ldap_bind($ds) { $ldapbind = ldap_bind($ds, $conf->global->LDAP_ADMIN_DN, $conf->global->LDAP_ADMIN_PASS); } - - return $ldapbind; + + if ($ldapbind) + { + return $ldapbind; + } + else + { + $this->err = ldap_error($ldapbind); + } } /**