From 6871f7c3add3e4ccb3499b196c3fc73524066048 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 12 Jun 2006 14:55:44 +0000
Subject: [PATCH] =?UTF-8?q?d=E9but=20am=E9lioration=20LDAP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/ldap.php   |  2 +-
 htdocs/lib/ldap.lib.php | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 4605dc4544e..2b5b58d7285 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -313,7 +313,7 @@ if (function_exists("ldap_connect"))
 		  // Test ldap_unbind
 		  $unbind = $ldap->dolibarr_ldap_unbind($ds);
 		  
-		  if ($unbind)
+		  if ($bind && $unbind)
 		  {
 		  	print img_picto('','info');
 		  	print "Déconnection du dn $dn réussi<br>";
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index 600e4511a65..72f4abe0c31 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -70,12 +70,8 @@ function dolibarr_ldap_connect()
 	if ($ldapconnect)
 	{
 		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)
     {
-    	$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)
@@ -110,7 +106,7 @@ function dolibarr_ldap_bind($ds)
 */
 function dolibarr_ldap_unbind($ds)
 {
-	$ldapunbind = ldap_unbind($ds);
+	$ldapunbind = @ldap_unbind($ds);
 
 	return $ldapunbind;
 }