Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX escape email alias

Browse Source
This commit is contained in:
Laurent Destailleur
2019-10-05 14:15:14 +02:00
parent 083db12490
commit e90234c2bc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.formticket.class.php
View File

@@ -939,13 +939,13 @@ class FormTicket
if (is_array($contacts) && count($contacts) > 0) { if (is_array($contacts) && count($contacts) > 0) {
foreach ($contacts as $key => $info_sendto) { foreach ($contacts as $key => $info_sendto) {
if ($info_sendto['email'] != '') { if ($info_sendto['email'] != '') {
$sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . "> (" . $info_sendto['libelle'] . ")"); $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . ">")." <small>(" . dol_escape_htmltag($info_sendto['libelle']) . ")</small>";
} }
} }
} }
if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) { if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {
$sendto[] = $ticketstat->origin_email . "(origin)"; $sendto[] = dol_escape_htmltag($ticketstat->origin_email) . " <small>(".$langs->trans("TicketEmailOriginIssuer").")</small>";
} }
if ($ticketstat->fk_soc > 0) { if ($ticketstat->fk_soc > 0) {
@@ -953,12 +953,12 @@ class FormTicket
$ticketstat->fetch_thirdparty(); $ticketstat->fetch_thirdparty();
if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) { if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
$sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')'; $sendto[] = $ticketstat->thirdparty->email . ' <small>(' . $langs->trans('Customer') . ')</small>';
} }
} }
if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) { if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . '(generic email)'; $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . ' <small>(generic email)</small>';
} }
// Print recipient list // Print recipient list