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

Merge pull request #6540 from laudeco/fix/mailMassAction

Browse Source 
fix the from e-mail on mass action
This commit is contained in:
Laurent Destailleur 2017-03-18 04:34:37 +01:00 committed by GitHub
commit 4d6b20b785
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/core/actions_massactions.inc.php
View File

@ -209,7 +209,26 @@ if (! $error && $massaction == 'confirm_presend')
if (count($listofqualifiedinvoice) > 0) if (count($listofqualifiedinvoice) > 0)
{ {
$langs->load("commercial"); $langs->load("commercial");
$from = $user->getFullName($langs) . ' <' . $user->email .'>';
$fromtype = GETPOST('fromtype');
if ($fromtype === 'user') {
$from = $user->getFullName($langs) .' <'.$user->email.'>';
}
elseif ($fromtype === 'company') {
$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
}
elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
$tmp=explode(',', $user->email_aliases);
$from = trim($tmp[($reg[1] - 1)]);
}
elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
$from = trim($tmp[($reg[1] - 1)]);
}
else {
$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
}
$replyto = $from; $replyto = $from;
$subject = GETPOST('subject'); $subject = GETPOST('subject');
$message = GETPOST('message'); $message = GETPOST('message');