From 8eb90cf9e613d3f83749d7c28a59f269a7d46e48 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 31 Dec 2007 13:21:14 +0000
Subject: [PATCH] Fix: debugage authentification ldap

---
 htdocs/main.inc.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4280a4429eb..39072368723 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -314,34 +314,36 @@ if (! isset($_SESSION["dol_login"]))
 			$ldap->searchUser=$usertotest;
 			$ldap->searchPassword=$passwordtotest;
 			
+			if ($ldapdebug) dolibarr_syslog("Authentification LDAP --> Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
+			
 			$result=$ldap->connect_bind();
 			if ($result > 0)
+    	{
+    		if ($result == 2)
     		{
-    			if ($result == 2)
-    			{
-        			dolibarr_syslog("Authentification ok (en mode LDAP)");
-    				$login=$_POST["username"];
+    			dolibarr_syslog("Authentification ok (en mode LDAP)");
+    			$login=$_POST["username"];
 					$test=false;
-    			}
-    			if ($result == 1)
-    			{
-            		dolibarr_syslog("Authentification ko bad password (en mode LDAP) pour '".$_POST["username"]."'");
-					sleep(1);
-					$langs->load('main');
-					$langs->load('other');
-					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-    			}
-				$ldap->close();
     		}
-    		else
+    		if ($result == 1)
     		{
-            	dolibarr_syslog("Authentification ko failed to connect to LDAP (en mode LDAP) pour '".$_POST["username"]."'");
+    			dolibarr_syslog("Authentification ko bad password (en mode LDAP) pour '".$_POST["username"]."'");
+    			sleep(1);
+    			$langs->load('main');
+    			$langs->load('other');
+    			$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+    		}
+				$ldap->close();
+    	}
+    	else
+    	{
+       	dolibarr_syslog("Authentification ko failed to connect to LDAP (en mode LDAP) pour '".$_POST["username"]."'");
 				sleep(1);
 				$langs->load('main');
 				$langs->load('other');
 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-    		}
-	    }
+    	}
+	   }
     }
 
     if (! $login)