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

Update html.formmail.class.php

Browse Source
This commit is contained in:
BENKE Charlene 2022-06-09 15:13:29 +02:00 committed by GitHub
parent 429f9c027e
commit d335bb22a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,7 +395,7 @@ class FormMail extends Form
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) { if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
$newlang = $this->param['langsmodels']; $newlang = $this->param['langsmodels'];
} }
if (!empty($newlang)) { if (!empty($newlang)) {
@ -584,7 +584,10 @@ class FormMail extends Form
} }
// Add also company main email // Add also company main email
$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
$liste['company'] = !empty($conf->global->MAIN_INFO_SOCIETE_NOM)?$conf->global->MAIN_INFO_SOCIETE_NOM:$conf->global->MAIN_INFO_SOCIETE_MAIL;
$liste['company'].=' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
}
// Add also email aliases if there is some // Add also email aliases if there is some
$listaliases = array( $listaliases = array(
@ -1540,7 +1543,7 @@ class FormMail extends Form
$extrafields->fetch_name_optionals_label($product->table_element, true); $extrafields->fetch_name_optionals_label($product->table_element, true);
if (is_array($extrafields->attributes[$product->table_element]['label']) && count($extrafields->attributes[$product->table_element]['label']) > 0) { if (!empty($extrafields->attributes[$product->table_element]['label']) && is_array($extrafields->attributes[$product->table_element]['label']) && count($extrafields->attributes[$product->table_element]['label']) > 0) {
foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) { foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = $product->array_options['options_'.$key]; $substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = $product->array_options['options_'.$key];
} }