From 02171d7a0b50c5319aa2ce5c0c7c54bb2458a7bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 26 Apr 2007 00:32:08 +0000
Subject: [PATCH] =?UTF-8?q?S=E9cu:=20Le=20mot=20de=20passe=20ne=20doit=20p?=
 =?UTF-8?q?as=20apparaitre=20meme=20crypt=E9=20sauf=20pour=20admin=20qui?=
 =?UTF-8?q?=20peut=20apparaitre=20crypt=E9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/user/fiche.php |  2 +-
 htdocs/user/ldap.php  | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 6a8d8c93d6c..f21aad183c1 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -837,7 +837,7 @@ else
             	if ($fuser->pass) print eregi_replace('.','*',$fuser->pass);
             	else
             	{
-	            	if ($user->admin) print $langs->trans("Crypted").': '.$fuser->pass_indatabase;
+	            	if ($user->admin) print $langs->trans("Crypted").': '.$fuser->pass_indatabase_crypted;
             		else print $langs->trans("Hidden");
             	}
             	print "</td>";
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index fb92a2c72c6..c285235ab4c 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -144,22 +144,6 @@ if ($conf->global->LDAP_SERVER_TYPE == "activedirectory")
   print "</tr>\n";
 }
 
-// Password not crypted
-if ($conf->global->LDAP_FIELD_PASSWORD)
-{
-	print '<tr><td width="25%" valign="top">'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
-	print '<td>'.$fuser->pass.'</td>';
-	print "</tr>\n";
-}
-
-// Password crypted
-if ($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
-{
-	print '<tr><td width="25%" valign="top">'.$langs->trans("LDAPFieldPasswordCrypted").'</td>';
-	print '<td>'.$fuser->pass_crypted.'</td>';
-	print "</tr>\n";
-}
-
 // LDAP DN
 print '<tr><td>LDAP '.$langs->trans("LDAPUserDn").'</td><td class="valeur">'.$conf->global->LDAP_USER_DN."</td></tr>\n";
 
@@ -193,7 +177,8 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 }
 
 print "</div>\n";
-print "<br>\n";
+
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "<br>\n";