diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 84bedb9adf0..db5cd04de22 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -83,10 +83,10 @@ if ($action == 'dolibarr2ldap') * View */ -llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); - $form = new Form($db); +llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); + $head = member_prepare_head($object); dol_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user'); @@ -98,12 +98,12 @@ dol_banner_tab($object, 'rowid', $linkback); print '
'; print '
'; -print ''; +print '
'; // Login -print ''; +print ''; -// Password not crypted +// If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) { print ''; @@ -111,18 +111,11 @@ if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) print "\n"; } -// Password crypted -if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) -{ - print ''; - print ''; - print "\n"; -} +$adht = new AdherentType($db); +$adht->fetch($object->typeid); // Type -print '\n"; - -$langs->load("admin"); +print '\n"; // LDAP DN print '\n"; diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 07a902f0a3d..083c056a518 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -80,7 +80,7 @@ if ($id) print '
'; print '
'; - print '
'.$langs->trans("Login").''.$object->login.' 
'.$langs->trans("Login").' / '.$langs->trans("Id").''.$object->login.' 
'.$langs->trans("LDAPFieldPasswordNotCrypted").'
'.$langs->trans("LDAPFieldPasswordCrypted").''.$object->pass_crypted.'
'.$langs->trans("Type").''.$object->type."
'.$langs->trans("Type").''.$adht->getNomUrl(1)."
LDAP '.$langs->trans("LDAPMemberDn").''.$conf->global->LDAP_MEMBER_DN."
'; + print '
'; // Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 7dd5a8ce23a..909a5c69d40 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -478,7 +478,7 @@ if ($rowid > 0) print '
'; print '
'; - print '
'; + print '
'; // Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))