vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2026-06-27 00:18:09 +02:00
commit c9ca147f5c
6 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
htdocs/adherents/list.php
View file

@ -1523,8 +1523,9 @@ while ($i < $imaxinloop) {
}
// EMail
if (!empty($arrayfields['d.email']['checked'])) {
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->email).'">';
print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1);
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($obj->email).'">';
$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 "</td>\n";
if (!$i) {
$totalarray['nbfield']++;

5
htdocs/contact/list.php
View file

@ -1800,11 +1800,12 @@ while ($i < $imaxinloop) {
// EMail
if (!empty($arrayfields['p.email']['checked'])) {
print '<td class="nowraponall tdoverflowmax200" title="'.dolPrintHTML($obj->email).'">';
print '<td class="nowraponall tdoverflowmax200" title="'.dolPrintHTMLForAttribute($obj->email).'">';
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 '</td>';
if (!$i) {

20
htdocs/public/members/new.php
View file

@ -665,13 +665,14 @@ print load_fiche_titre(img_picto('', 'member_nocolor', 'class="pictofixedwidth"'
print '<div align="center">';
print '<div id="divsubscribe">';
print '<div class="center subscriptionformhelptext opacitymedium justify">';
print '<div class="center subscriptionformhelptext opacitylow justify small margintoponly"><br>';
if (getDolGlobalString('MEMBER_NEWFORM_TEXT')) {
print $langs->trans(getDolGlobalString('MEMBER_NEWFORM_TEXT'))."<br>\n";
} else {
print $langs->trans("NewSubscriptionDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
}
print '</div>';
print '<br>';
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 '<br><div class="div-table-responsive">';
print '<table class="tagtable liste">'."\n";
print '<table class="tagtable liste noborder">'."\n";
print '<input type="hidden" name="action" value="create">';
print '<tr class="liste_titre">';
@ -1370,13 +1371,22 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
$minimumamountbytype = $adht->minimumamountbytype(1); // Load the array of amount per type
print '<tr class="oddeven">';
// Label
print '<td>'.dolPrintHTML($objp->label).'</td>';
print '<td>';
print '<div class="twolinesmax-normallineheight minwidth200onall">';
print dolPrintHTML($objp->label);
print '</div>';
print '</td>';
// Duration
print '<td class="center">';
$unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration);
print '<span class="badge badge-primary">';
print max(1, intval($objp->duration)).' '.$units[$unit];
print '</span>';
print '</td>';
// Amount
print '<td class="center"><span class="amount nowrap">';
@ -1406,7 +1416,8 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
print "–"; // No subscription required
}
print '</span></td>';
print '<td class="center">';
print '<td class="center minwidth100">';
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 '</td>';
if (empty($hidevoteallowed)) {
print '<td class="center">'.yn($objp->vote).'</td>';
}

3
htdocs/resource/list.php
View file

@ -705,7 +705,8 @@ while ($i < $imaxinloop) {
}
if (!empty($arrayfields['t.email']['checked'])) {
print '<td>'.dol_print_email($objectstatic->email, 0, 0, 1, 0, 0, 1).'</td>';
$showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($obj->email).'">'.dol_print_email($objectstatic->email, 0, 0, 1, 0, $showinvalidemail, 1).'</td>';
if (!$i) {
$totalarray['nbfield']++;
}

3
htdocs/societe/list.php
View file

@ -2143,7 +2143,8 @@ while ($i < $imaxinloop) {
}
// Email
if (!empty($arrayfields['s.email']['checked'])) {
print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, 0, 1)."</td>\n";
$showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($obj->email).'">'.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, $showinvalidemail, 1)."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}

3
htdocs/user/list.php
View file

@ -1247,7 +1247,8 @@ while ($i < $imaxinloop) {
}
// Email
if (!empty($arrayfields['u.email']['checked'])) {
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute((string) $obj->email).'">'.dol_print_email((string) $obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)."</td>\n";
$showinvalidemail = (int) !getDolGlobalInt('MAIN_SHOW_INVALID_EMAIL_IN_LIST'); // to avoid slow display
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($obj->email).'">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, $showinvalidemail, 1)."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}