diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 6eb64f1eae1..d57b37c57ce 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -1003,7 +1003,7 @@ if ($rowid && $action != 'edit') { // Cree un tableau formulaire $formquestion=array(); - if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $langs->trans("SendAnEMailToMember",$adh->email), 'value' => 'true'); + if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $langs->trans("SendAnEMailToMember",$adh->email), 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false)); $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion); if ($ret == 'html') print '
'; @@ -1209,7 +1209,7 @@ if ($rowid && $action != 'edit') */ print '
'; - if ($action != 'editlogin' && $action != 'editthirdparty') + if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty') { // Modify if ($user->rights->adherent->creer) diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index cec34b94e0f..e7d379eb588 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -184,7 +184,7 @@ class Form { if ($type == 'info' || $type == 'help') return $text; } - // Info or help + // Info or help if ($type == 'info') $img=img_help(0,$alt); if ($type == 'help' || $type ==1) $img=img_help(1,$alt); if ($type == 'superadmin') $img=img_redstar($alt); @@ -1641,7 +1641,9 @@ class Form $more.=''; $more.=''.$input['label'].'  '; $more.='