Send expensereports-related e-mails from MAIN_MAIL_EMAIL_FROM address
This commit is contained in:
parent
89261d51e3
commit
57927cac06
@ -414,7 +414,7 @@ if (empty($reshook)) {
|
||||
// FROM
|
||||
$expediteur = new User($db);
|
||||
$expediteur->fetch($object->fk_user_author);
|
||||
$emailFrom = $expediteur->email;
|
||||
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||
|
||||
if ($emailTo && $emailFrom) {
|
||||
$filename = array(); $filedir = array(); $mimetype = array();
|
||||
@ -521,7 +521,7 @@ if (empty($reshook)) {
|
||||
// FROM
|
||||
$expediteur = new User($db);
|
||||
$expediteur->fetch($object->fk_user_author);
|
||||
$emailFrom = $expediteur->email;
|
||||
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||
|
||||
if ($emailFrom && $emailTo) {
|
||||
$filename = array(); $filedir = array(); $mimetype = array();
|
||||
@ -637,7 +637,7 @@ if (empty($reshook)) {
|
||||
// FROM
|
||||
$expediteur = new User($db);
|
||||
$expediteur->fetch($object->fk_user_approve > 0 ? $object->fk_user_approve : $object->fk_user_validator);
|
||||
$emailFrom = $expediteur->email;
|
||||
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||
|
||||
if ($emailFrom && $emailTo) {
|
||||
$filename = array(); $filedir = array(); $mimetype = array();
|
||||
@ -745,7 +745,7 @@ if (empty($reshook)) {
|
||||
// FROM
|
||||
$expediteur = new User($db);
|
||||
$expediteur->fetch($object->fk_user_refuse);
|
||||
$emailFrom = $expediteur->email;
|
||||
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||
|
||||
if ($emailFrom && $emailTo) {
|
||||
$filename = array(); $filedir = array(); $mimetype = array();
|
||||
@ -859,7 +859,7 @@ if (empty($reshook)) {
|
||||
// FROM
|
||||
$expediteur = new User($db);
|
||||
$expediteur->fetch($object->fk_user_cancel);
|
||||
$emailFrom = $expediteur->email;
|
||||
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||
|
||||
if ($emailFrom && $emailTo) {
|
||||
$filename = array(); $filedir = array(); $mimetype = array();
|
||||
@ -1039,7 +1039,7 @@ if (empty($reshook)) {
|
||||
// FROM
|
||||
$expediteur = new User($db);
|
||||
$expediteur->fetch($user->id);
|
||||
$emailFrom = $expediteur->email;
|
||||
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||
|
||||
if ($emailFrom && $emailTo) {
|
||||
$filename = array(); $filedir = array(); $mimetype = array();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user