diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index c0847630a64..6c57b720c7e 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -1523,8 +1523,9 @@ while ($i < $imaxinloop) { } // EMail if (!empty($arrayfields['d.email']['checked'])) { - print ''; - print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1); + print ''; + $showinvalidemail = getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST', 1); // in list, we check only syntax of emails + print dol_print_email($obj->email, 0, 0, 1, 64, $showinvalidemail, 1); print "\n"; if (!$i) { $totalarray['nbfield']++; diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index a734d6a784e..8bb9f99a5d6 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -1800,11 +1800,12 @@ while ($i < $imaxinloop) { // EMail if (!empty($arrayfields['p.email']['checked'])) { - print ''; + print ''; if ($contextpage == 'poslist') { print $obj->email; } else { - print dol_print_email($obj->email, $obj->rowid, $obj->socid, 1, 18, 0, 1); + $showinvalidemail = getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST', 1); // in list, we check only syntax of emails + print dol_print_email($obj->email, $obj->rowid, $obj->socid, 1, 18, $showinvalidemail, 1); } print ''; if (!$i) { diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 322cbcd466f..8046c34a0f5 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -665,13 +665,14 @@ print load_fiche_titre(img_picto('', 'member_nocolor', 'class="pictofixedwidth"' print '
'; print '
'; -print '
'; +print '

'; if (getDolGlobalString('MEMBER_NEWFORM_TEXT')) { print $langs->trans(getDolGlobalString('MEMBER_NEWFORM_TEXT'))."
\n"; } else { print $langs->trans("NewSubscriptionDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."
\n"; } print '
'; +print '
'; dol_htmloutput_errors($errmsg); dol_htmloutput_events(); @@ -1344,7 +1345,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR $num = $db->num_rows($result); print '
'; - print ''."\n"; + print '
'."\n"; print ''; print ''; @@ -1370,13 +1371,22 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR $minimumamountbytype = $adht->minimumamountbytype(1); // Load the array of amount per type print ''; + // Label - print ''; + print ''; + // Duration print ''; + // Amount print ''; - print ''; + if (empty($hidevoteallowed)) { print ''; } diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 7f2bc1a6006..8484e9905dd 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -705,7 +705,8 @@ while ($i < $imaxinloop) { } if (!empty($arrayfields['t.email']['checked'])) { - print ''; + $showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display + print ''; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 45b7e1eb329..176e9b01154 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -2143,7 +2143,8 @@ while ($i < $imaxinloop) { } // Email if (!empty($arrayfields['s.email']['checked'])) { - print '\n"; + $showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display + print '\n"; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 9f952a074d4..cdf640d555c 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -1247,7 +1247,8 @@ while ($i < $imaxinloop) { } // Email if (!empty($arrayfields['u.email']['checked'])) { - print '\n"; + $showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display + print '\n"; if (!$i) { $totalarray['nbfield']++; }
'.dolPrintHTML($objp->label).''; + print '
'; + print dolPrintHTML($objp->label); + print '
'; + print '
'; $unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration); + print ''; print max(1, intval($objp->duration)).' '.$units[$unit]; + print ''; print ''; @@ -1406,7 +1416,8 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print "–"; // No subscription required } print ''; + + print ''; if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { @@ -1415,6 +1426,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print $langs->trans("MorAndPhy"); } print ''.yn($objp->vote).''.dol_print_email($objectstatic->email, 0, 0, 1, 0, 0, 1).''.dol_print_email($objectstatic->email, 0, 0, 1, 0, $showinvalidemail, 1).''.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, 0, 1)."'.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, $showinvalidemail, 1)."'.dol_print_email((string) $obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)."'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, $showinvalidemail, 1)."