From e03c7dd496d5726c7e41cc5e8971ed2a60b1f5f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 21 Nov 2006 16:57:36 +0000
Subject: [PATCH] Renomage classe gestion LDAP en ldap.class.php

---
 htdocs/adherents/ldap.php      | 4 ++--
 htdocs/admin/ldap.php          | 4 ++--
 htdocs/admin/ldap_contacts.php | 4 ++--
 htdocs/admin/ldap_groups.php   | 2 +-
 htdocs/admin/ldap_members.php  | 2 +-
 htdocs/admin/ldap_users.php    | 2 +-
 htdocs/contact.class.php       | 6 +++---
 htdocs/contact/ldap.php        | 4 ++--
 htdocs/user.class.php          | 6 +++---
 htdocs/user/fiche.php          | 8 ++++----
 htdocs/user/group/ldap.php     | 4 ++--
 htdocs/user/ldap.php           | 4 ++--
 htdocs/usergroup.class.php     | 6 +++---
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 5b6f67c89be..f0f6b522810 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -29,7 +29,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
 
@@ -140,7 +140,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
 // Lecture LDAP
-$ldap=new AuthLdap();
+$ldap=new Ldap();
 $result=$ldap->connect();
 if ($result)
 {
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 6bfacacc9d2..ea329f85e2b 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -31,7 +31,7 @@
 */
 
 require("./pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
 
 $langs->load("admin");
@@ -257,7 +257,7 @@ if (function_exists("ldap_connect"))
 
 	if ($_GET["action"] == 'test')
 	{
-		$ldap = new AuthLdap();	// Les parametres sont passés et récupérés via $conf
+		$ldap = new Ldap();	// Les parametres sont passés et récupérés via $conf
 
 		$result = $ldap->connect();	// Avec OpenLDAP 2.x.x, $reslt sera toujours vrai car connection a lieu dans premeiere fonction ldap_*
 		if ($result)
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 49b33ad1f7b..50157b63eb5 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -31,9 +31,9 @@
 */
 
 require("./pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
-require_once (DOL_DOCUMENT_ROOT."/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 638669e9e5a..53bd41be71a 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -33,7 +33,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index e97e82d7c88..f98375d5c33 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -33,7 +33,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 2c0f6e93140..9284d150aa9 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -33,7 +33,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index 43ffe06e385..6313a6eb0a4 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -29,7 +29,7 @@
         \version    $Revision$
 */
 
-require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 
 
@@ -215,7 +215,7 @@ class Contact
 
 		dolibarr_syslog("Contact.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
 	
-		$ldap=new AuthLdap();
+		$ldap=new Ldap();
 		$result=$ldap->connect();
 		if ($result)
 		{
@@ -350,7 +350,7 @@ class Contact
 
 		dolibarr_syslog("Contact.class::update_ldap this->id=".$this->id,LOG_DEBUG);
 	
-		$ldap=new AuthLdap();
+		$ldap=new Ldap();
 		$result=$ldap->connect();
 		if ($result)
 		{
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index dbf427ebd07..90799764624 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -30,7 +30,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 $user->getrights('commercial');
 
@@ -152,7 +152,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
 // Lecture LDAP
-$ldap=new AuthLdap();
+$ldap=new Ldap();
 $result=$ldap->connect();
 if ($result)
 {
diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index f929aae3be9..758ae1c6362 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -37,7 +37,7 @@
   	    \version    $Revision$
 */
 
-require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 
 /**
@@ -1264,7 +1264,7 @@ class User
 
 		dolibarr_syslog("User.class::update_ldap this->id=".$this->id,LOG_DEBUG);
 
-		$ldap=new AuthLdap();
+		$ldap=new Ldap();
 		$result=$ldap->connect();
 		if ($result)
 		{
@@ -1339,7 +1339,7 @@ class User
 
 		dolibarr_syslog("User.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
 
-		$ldap=new AuthLdap();
+		$ldap=new Ldap();
 		$result=$ldap->connect();
 		if ($result)
 		{
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 707d900087a..9f102100aa3 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -32,7 +32,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 
 
@@ -124,7 +124,7 @@ if ($conf->ldap->enabled && $_GET["action"] == 'reactivate' && $candisableuser)
         $userid = $_GET["id"];
         $reactiveuser = new User($db, $userid);
         $reactiveuser->fetch();
-        $ldap = New AuthLdap();
+        $ldap = new Ldap();
         if ($ldap->connect())
         {
         	$checkDn = $conf->global->LDAP_USER_DN;
@@ -386,7 +386,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		$login     = $conf->global->LDAP_FIELD_LOGIN_SAMBA;
 		$SID       = "objectsid";
 
-		$ldap = new AuthLdap();
+		$ldap = new Ldap();
 
 		if ($ldap->connect())
 		{
@@ -664,7 +664,7 @@ else
     	if ($conf->ldap->enabled && $fuser->ldap_sid)
     	{
     		
-    		$ldap = New AuthLdap();
+    		$ldap = new Ldap();
     		if ($ldap->connect())
     		{
     			$entries = $ldap->fetch($fuser->login);
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 0410d330184..817b195223b 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -30,7 +30,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 $user->getrights('commercial');
 
@@ -116,7 +116,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
 // Lecture LDAP
-$ldap=new AuthLdap();
+$ldap=new Ldap();
 $result=$ldap->connect();
 if ($result)
 {
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 5deb38aa6f2..7b8ae87110e 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -29,7 +29,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 $user->getrights('commercial');
 
@@ -131,7 +131,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
 // Lecture LDAP
-$ldap=new AuthLdap();
+$ldap=new Ldap();
 $result=$ldap->connect();
 if ($result)
 {
diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php
index 5c5fa25533d..31d6e427e0b 100644
--- a/htdocs/usergroup.class.php
+++ b/htdocs/usergroup.class.php
@@ -27,7 +27,7 @@
 	 \version    $Revision$
 */
 
-require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
+require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 
 /**
@@ -506,7 +506,7 @@ class UserGroup
 
 		dolibarr_syslog("UserGroup.class::update_ldap this->id=".$this->id,LOG_DEBUG);
 
-		$ldap=new AuthLdap();
+		$ldap=new Ldap();
 		$result=$ldap->connect();
 		if ($result)
 		{
@@ -578,7 +578,7 @@ class UserGroup
 
 		dolibarr_syslog("UserGroup.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
 
-		$ldap=new AuthLdap();
+		$ldap=new Ldap();
 		$result=$ldap->connect();
 		if ($result)
 		{