From 65ba5e96c019bd7d0660676f7f17dcf4eb4cccc6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 26 Apr 2007 00:13:00 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Gros=20bug=20dans=20les=20fonctions=20LD?=
 =?UTF-8?q?AP=20qui=20ne=20g=E9rait=20pas=20bien=20la=20majuscule,=20minus?=
 =?UTF-8?q?cule.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/ldap.class.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php
index 23e37efecdf..21bef35f552 100644
--- a/htdocs/lib/ldap.class.php
+++ b/htdocs/lib/ldap.class.php
@@ -232,7 +232,7 @@ class Ldap
 					// Try in auth mode
 					if ($conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS)
 					{
-						dolibarr_syslog("Ldap.class::connect_bind try bindauth on ".$host." user=".$conf->global->LDAP_ADMIN_DN,LOG_DEBUG);
+						dolibarr_syslog("Ldap::connect_bind try bindauth on ".$host." user=".$conf->global->LDAP_ADMIN_DN,LOG_DEBUG);
 						$result=$this->bindauth($conf->global->LDAP_ADMIN_DN,$conf->global->LDAP_ADMIN_PASS);
 						if ($result)
 						{
@@ -248,7 +248,7 @@ class Ldap
 					// Try in anonymous
 					if (! $this->bind)
 					{
-						dolibarr_syslog("Ldap.class::connect_bind try bind on ".$host,LOG_DEBUG);
+						dolibarr_syslog("Ldap::connect_bind try bind on ".$host,LOG_DEBUG);
 						$result=$this->bind();
 						if ($result)
 						{
@@ -268,7 +268,7 @@ class Ldap
 		}
 
 		$return=($connected ? $connected : -1);
-		dolibarr_syslog("Ldap.class::connect_bind return=".$return,LOG_DEBUG);
+		dolibarr_syslog("Ldap::connect_bind return=".$return,LOG_DEBUG);
 		return $return;
 	}
 
@@ -406,7 +406,7 @@ class Ldap
 
 		if (! $olddn) $olddn=$dn;
 
-		dolibarr_syslog("Ldap.class::update dn=".$dn." olddn=".$olddn);
+		dolibarr_syslog("Ldap::update dn=".$dn." olddn=".$olddn);
 
 		// On supprime et on insère
 		$result = $this->delete($olddn);
@@ -414,13 +414,13 @@ class Ldap
 		if ($result <= 0)
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error;
-			dolibarr_syslog("Ldap.class::update ".$this->error,LOG_ERROR);
+			dolibarr_syslog("Ldap::update ".$this->error,LOG_ERROR);
 			//print_r($info);
 			return -1;
 		}
 		else
 		{
-			dolibarr_syslog("Ldap.class::update done successfully");
+			dolibarr_syslog("Ldap::update done successfully");
 			return 1;
 		}
 	}
@@ -605,7 +605,7 @@ class Ldap
 	{
 		global $conf;
 
-		dolibarr_syslog("Ldap.class::add dn=".$dn." info=".join(',',$info));
+		dolibarr_syslog("Ldap::add dn=".$dn." info=".join(',',$info));
 
 		// Encode en UTF8
 		$dn=$this->ldap_utf8_encode($dn);
@@ -621,12 +621,12 @@ class Ldap
 
 		if ($result)
 		{
-			dolibarr_syslog("Ldap.class::add successfull");
+			dolibarr_syslog("Ldap::add successfull");
 			return 1;
 		}
 		else
 		{
-			dolibarr_syslog("Ldap.class::add failed");
+			dolibarr_syslog("Ldap::add failed");
 			return -1;
 		}
 	}
@@ -640,7 +640,7 @@ class Ldap
 	{
 		global $conf;
 
-		dolibarr_syslog("Ldap.class::delete Delete LDAP entry dn=".$dn);
+		dolibarr_syslog("Ldap::delete Delete LDAP entry dn=".$dn);
 
 		// Encode en UTF8
 		$dn=$this->ldap_utf8_encode($dn);
@@ -745,11 +745,11 @@ class Ldap
 	 *
 	 * 		\remarks	ldapsearch -LLLx -hlocalhost -Dcn=admin,dc=parinux,dc=org -w password -b "ou=adherents,ou=people,dc=parinux,dc=org" userPassword
      */
-    function getUsers($search, $userDn, $useridentifier, $attributeArray, $activefilter=0)
+    function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0)
     {
 		$userslist=array();
 		
-		dolibarr_syslog("Ldap::getUsers search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")");
+		dolibarr_syslog("Ldap::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")");
 
 	    // if the directory is AD, then bind first with the search user first
         if ($this->serverType == "activedirectory") {
@@ -770,13 +770,13 @@ class Ldap
         if (is_array($attributeArray))
 		{
 			// Return list with required fields
-			dolibarr_syslog("Ldap::getUsers connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
+			dolibarr_syslog("Ldap::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
 		}
 		else
 		{
 			// Return list with fields selected by default
-			dolibarr_syslog("Ldap::getUsers connection=".$this->connection." userDn=".$userDn." filter=".$filter);
+			dolibarr_syslog("Ldap::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $userDn, $filter);
 		}
         if (!$this->result)
@@ -901,7 +901,7 @@ class Ldap
 	*/
 	function search($checkDn, $filter)
 	{
-		dolibarr_syslog("Ldap.class::search checkDn=".$checkDn." filter=".$filter);
+		dolibarr_syslog("Ldap::search checkDn=".$checkDn." filter=".$filter);
 
 		$checkDn=$this->ldap_utf8_encode($checkDn);
 		$filter=$this->ldap_utf8_encode($filter);