tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Remove default from address for error emails

Browse Source 
errors@silverstripe.com has previously been set as the default email
address for error emails. This means that people across the world are
sending from that domain, and if we put SPF records in place it would
stop error emailing.

This change means that emails will be sent from the server-configured
default, which matches the behaviour of the Mailer class.

Leaving until 3.x (3.5, presumably) as it’s a feature change.

Fixes #5360.
This commit is contained in:
Sam Minnee 2016-06-01 18:05:55 +12:00
parent 11aad47eeb
commit 8a58041fba
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev/LogEmailWriter.php
View File

@ -15,7 +15,7 @@ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract {
* @config
* @var $send_from Email address to send log information from
*/
private static $send_from = 'errors@silverstripe.com';
private static $send_from = null;
protected $emailAddress;
@ -69,6 +69,12 @@ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract {
// Use plain mail() implementation to avoid complexity of Mailer implementation.
// Only use built-in mailer when we're in test mode (to allow introspection)
$mailer = Email::mailer();
$headers = "Content-type: text/html";
if ($from) {
$headers .= "\nFrom: " . $from;
}
if($mailer instanceof TestMailer) {
$mailer->sendHTML(
$this->emailAddress,
@ -76,14 +82,14 @@ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract {
$subject,
$data,
null,
"Content-type: text/html\nFrom: " . $from
$headers
);
} else {
mail(
$this->emailAddress,
$subject,
$data,
"Content-type: text/html\nFrom: " . $from
$headers
);
}