diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index b7e850cf065..09a62cd4454 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -166,9 +166,9 @@ if ($_POST["action"] == 'add' && $canadduser) { $edituser->setPassword($user,trim($_POST['password']),$conf->global->DATABASE_PWD_ENCRYPTED); } - + $db->commit(); - + Header("Location: fiche.php?id=$id"); exit; } @@ -425,10 +425,10 @@ if (($action == 'create') || ($action == 'adduserldap')) $conf->global->LDAP_FIELD_FIRSTNAME, $conf->global->LDAP_FIELD_LOGIN, $conf->global->LDAP_FIELD_LOGIN_SAMBA); - + // Remove from required_fields all entries not configured in LDAP (empty) and duplicated $required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement"))); - + // Get from LDAP database an array of results $ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1); if (is_array($ldapusers)) @@ -714,7 +714,7 @@ else { $message .= $ldap->error; } - + $passDoNotExpire = 0; $userChangePassNextLogon = 0; $userDisabled = 0; @@ -737,7 +737,7 @@ else $userDisabled = 1; $statutUACF = "ACCOUNTDISABLE"; } - + if ($ldap->pwdlastset == 0) { $userChangePassNextLogon = 1; @@ -912,7 +912,7 @@ else { $societe = new Societe($db); $societe->fetch($fuser->societe_id); - print ''.img_object($langs->trans("ShowCompany"),'company').' '.dolibarr_trunc($societe->nom,32).''; + print $societe->getNomUrl(1,''); } else { @@ -1014,7 +1014,7 @@ else /* * Barre d'actions */ - + print '
'; @@ -1034,7 +1034,7 @@ else { print ''.$langs->trans("ReinitPassword").''; } - + if (($user->id != $_GET["id"] && $caneditpassword) && $fuser->email && $fuser->login && !$fuser->ldap_sid) { print ''.$langs->trans("SendNewPassword").''; @@ -1095,7 +1095,7 @@ else dolibarr_print_error($db); } $db->free($resql); - + if ($caneditperms) { $form = new Form($db); @@ -1120,12 +1120,12 @@ else $usergroup=new UserGroup($db); $listofgroups=$usergroup->listGroupsForUser($fuser); $num=sizeof($listofgroups); - + print ''; print ''; print ''; print "\n"; - + if ($num > 0) { $i = 0; @@ -1166,7 +1166,7 @@ else { print ''; } - + print "
'.$langs->trans("Groups").' 
'.$langs->trans("None").'
"; print "
"; } @@ -1317,7 +1317,7 @@ else { $societe = new Societe($db); $societe->fetch($fuser->societe_id); - print ''.img_object($langs->trans("ShowCompany"),'company').' '.dolibarr_trunc($societe->nom,32).''; + print $societe->getNomUrl(1,''); if ($fuser->contact_id) { $contact = new Contact($db); @@ -1373,7 +1373,7 @@ else print $fuser->office_fax; } print ''; - + // EMail print "".''.$langs->trans("EMail").''; print '';