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 '
| '.dolPrintHTML($objp->label).' | '; + print '';
+ print ' ';
+ print dolPrintHTML($objp->label);
+ print ' ';
+ print ' | ';
+
// Duration
print ''; $unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration); + print ''; print max(1, intval($objp->duration)).' '.$units[$unit]; + print ''; print ' | '; + // Amount print ''; @@ -1406,7 +1416,8 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print "–"; // No subscription required } print ' | '; - 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 ' | '; + if (empty($hidevoteallowed)) { print ''.yn($objp->vote).' | '; } 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 ''.dol_print_email($objectstatic->email, 0, 0, 1, 0, 0, 1).' | '; + $showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display + print ''.dol_print_email($objectstatic->email, 0, 0, 1, 0, $showinvalidemail, 1).' | '; 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 ''.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, 0, 1)." | \n"; + $showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display + print ''.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, $showinvalidemail, 1)." | \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 ''.dol_print_email((string) $obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)." | \n"; + $showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display + print ''.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, $showinvalidemail, 1)." | \n"; if (!$i) { $totalarray['nbfield']++; }