diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 1c2f214b817..ab8ab7ed3fd 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1146,22 +1146,43 @@ else
// Nom
print "
".'| '.$langs->trans("Name").'* | ';
print '';
- if ($caneditfield && !$fuser->ldap_sid) print '';
- else print $fuser->nom;
+ if ($caneditfield && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->nom;
+ }
print ' |
';
// Prenom
print "".'| '.$langs->trans("Firstname").' | ';
print '';
- if ($caneditfield && !$fuser->ldap_sid) print '';
- else print $fuser->prenom;
+ if ($caneditfield && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->prenom;
+ }
print ' |
';
// Login
print "".'| '.$langs->trans("Login").'* | ';
print '';
- if ($user->admin && !$fuser->ldap_sid) print '';
- else print $fuser->login.'';
+ if ($user->admin && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->login;
+ }
print ' |
';
// Pass
@@ -1248,59 +1269,87 @@ else
print "\n";
// Tel, fax, portable
- print "".'| '.$langs->trans("Phone").' | ';
- print '';
- if ($caneditfield && !$fuser->ldap_sid) print '';
- else print $fuser->office_phone;
- print ' |
';
-
- print "".'| '.$langs->trans("Fax").' | ';
- print '';
- if ($caneditfield && !$fuser->ldap_sid) print '';
- else print $fuser->office_fax;
- print ' |
';
-
- print "".'| '.$langs->trans("Mobile").' | ';
- print '';
- if ($caneditfield && !$fuser->ldap_sid) print '';
- else print $fuser->user_mobile;
- print ' |
';
+ print "".'| '.$langs->trans("Phone").' | ';
+ print '';
+ if ($caneditfield && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->office_phone;
+ }
+ print ' |
';
+
+ print "".'| '.$langs->trans("Fax").' | ';
+ print '';
+ if ($caneditfield && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->office_fax;
+ }
+ print ' |
';
+
+ print "".'| '.$langs->trans("Mobile").' | ';
+ print '';
+ if ($caneditfield && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->user_mobile;
+ }
+ print ' |
';
// EMail
print "".'| '.$langs->trans("EMail").' | ';
print '';
- if ($caneditfield && !$fuser->ldap_sid) print '';
- else print $fuser->email;
+ if ($caneditfield && !$fuser->ldap_sid)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ print $fuser->email;
+ }
print ' |
';
-
- // Statut
- print '| '.$langs->trans("Status").' | ';
- print '';
- print $fuser->getLibStatut(4);
- print ' |
';
-
- // Note
+
+ // Statut
+ print '| '.$langs->trans("Status").' | ';
+ print '';
+ print $fuser->getLibStatut(4);
+ print ' |
';
+
+ // Note
print '| '.$langs->trans("Note").' | ';
if ($caneditfield)
{
- if ($conf->fckeditor->enabled)
- {
- require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
- $doleditor=new DolEditor('note',$fuser->note,180,'dolibarr_notes','',false);
- $doleditor->Create();
- }
- else
- {
- print ' |
';
+ print '';
+ }
+ }
+ else
+ {
+ print nl2br($fuser->note);
+ }
+ print '';
// Autres caractéristiques issus des autres modules
if ($conf->webcal->enabled)
@@ -1322,8 +1371,8 @@ else
print '';
print '';
- print '';
- }
+ print '';
+ }
$ldap->close;
}
@@ -1336,6 +1385,4 @@ function dolValidElement($element) {
}
llxFooter('$Date$ - $Revision$');
-?>
-
-
+?>
\ No newline at end of file