From faa95045f67aa41f691fbdaa3b7155089fd2d02d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 8 Jul 2006 14:44:09 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20j'avais=20effectu=E9=20des=20tests=20lda?=
 =?UTF-8?q?p=20et=20je=20ne=20les=20avais=20pas=20enlev=E9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/user/fiche.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 3cd06d892d7..2ec18cdac87 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -106,7 +106,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
 }
 
 //reactive un compte ldap
-if ($_GET["action"] == 'reactivate' && $canadduser)
+if ($conf->ldap->enabled && $_GET["action"] == 'reactivate' && $canadduser)
 {
     if ($_GET["id"] <> $user->id)
     {
@@ -351,10 +351,10 @@ if (($action == 'create') || ($action == 'adduserldap'))
     /*
      * ajout utilisateur ldap
      */
-//     if ($conf->ldap->enabled)
-//     {
-//     	if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS)
-//     	{     		
+     if ($conf->ldap->enabled)
+     {
+     	if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS)
+     	{     		
      		$name      = $conf->global->LDAP_FIELD_NAME;
      		$firstname = $conf->global->LDAP_FIELD_FIRSTNAME;
      		$mail      = $conf->global->LDAP_FIELD_MAIL;
@@ -430,8 +430,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
 			print $ldap->ldapErrorCode;
 			print $ldap->ldapErrorText;
 		}
-	//}
-//}
+	}
+}
 
     print '<form action="fiche.php" method="post" name="createuser">';
     print '<input type="hidden" name="action" value="add">';
-- 
GitLab