tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-04 02:19:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6332 from andrewandante/BUGFIX/apply-send-all-emails-from-to-SS_LogEmailWriter

Browse Source
This commit is contained in:
Daniel Hensby 2016-11-25 11:21:12 +00:00
commit a9c85057b0
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dev/LogEmailWriter.php
View File

@ -60,7 +60,11 @@ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract {
$formattedData = $this->_formatter->format($event);
$subject = $formattedData['subject'];
$data = $formattedData['data'];
$from = Config::inst()->get('SS_LogEmailWriter', 'send_from');
if (Email::config()->send_all_emails_from) {
$from = Email::config()->send_all_emails_from;
} else {
$from = Config::inst()->get('SS_LogEmailWriter', 'send_from') ?: Email::config()->admin_email;
}
// override the SMTP server with a custom one if required
$originalSMTP = ini_get('SMTP');
@ -85,12 +89,22 @@ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract {
$headers
);
} else {
mail(
// Try it with the -f option first, without if it fails - borrowed from Mailer
$result = mail(
$this->emailAddress,
$subject,
$data,
$headers
$headers,
escapeshellarg("-f$from")
);
if(!$result) {
mail(
$this->emailAddress,
$subject,
$data,
$headers
);
}
}
// reset the SMTP server to the original