lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX email not visible into combo list

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-29 19:40:47 +02:00
parent eca5fc6504
commit d70c70a5fe
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.formmail.class.php
View File

@ -1066,6 +1066,7 @@ class FormMail extends Form
// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
$tmparray = $this->withto; $tmparray = $this->withto;
foreach ($tmparray as $key => $val) { foreach ($tmparray as $key => $val) {
$tmparray[$key] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]);
$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true); $tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
} }
@ -1074,6 +1075,7 @@ class FormMail extends Form
if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') { if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
$withtoselected = array_keys($tmparray); $withtoselected = array_keys($tmparray);
} }
$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, ""); $out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
} }
} }
@ -1101,6 +1103,7 @@ class FormMail extends Form
// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
$tmparray = $this->withtocc; $tmparray = $this->withtocc;
foreach ($tmparray as $key => $val) { foreach ($tmparray as $key => $val) {
$tmparray[$key] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]);
$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true); $tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
} }
$withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value $withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value
@ -1504,7 +1507,7 @@ class FormMail extends Form
/** /**
* Set substit array from object. This is call when suggesting the email template into forms before sending email. * Set ->substit (and ->substit_line) array from object. This is call when suggesting the email template into forms before sending email.
* *
* @param CommonObject $object Object to use * @param CommonObject $object Object to use
* @param Translate $outputlangs Object lang * @param Translate $outputlangs Object lang