Skip to content
Extraits de code Groupes Projets
Valider bac1b856 rédigé par mattab's avatar mattab
Parcourir les fichiers

Set default From: header in emails sent from Piwik.

This will fix the Custom Alerts missing From header.
parent 301129f6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
namespace Piwik; namespace Piwik;
use Piwik\Plugins\CoreAdminHome\CustomLogo;
use Zend_Mail; use Zend_Mail;
/** /**
...@@ -28,6 +29,17 @@ class Mail extends Zend_Mail ...@@ -28,6 +29,17 @@ class Mail extends Zend_Mail
{ {
parent::__construct($charset); parent::__construct($charset);
$this->initSmtpTransport(); $this->initSmtpTransport();
$this->setDefaultFrom();
}
private function setDefaultFrom()
{
$customLogo = new CustomLogo();
$fromEmailName = $customLogo->isEnabled()
? Piwik::translate('CoreHome_WebAnalyticsReports')
: Piwik::translate('ScheduledReports_PiwikReports');
$fromEmailAddress = Config::getInstance()->General['noreply_email_address'];
$this->setFrom($fromEmailAddress, $fromEmailName);
} }
/** /**
......
...@@ -274,13 +274,7 @@ class ScheduledReports extends \Piwik\Plugin ...@@ -274,13 +274,7 @@ class ScheduledReports extends \Piwik\Plugin
$mail = new Mail(); $mail = new Mail();
$mail->setSubject($subject); $mail->setSubject($subject);
$customLogo = new CustomLogo();
$fromEmailName = $customLogo->isEnabled()
? Piwik::translate('CoreHome_WebAnalyticsReports')
: Piwik::translate('ScheduledReports_PiwikReports');
$fromEmailAddress = Config::getInstance()->General['noreply_email_address'];
$attachmentName = $subject; $attachmentName = $subject;
$mail->setFrom($fromEmailAddress, $fromEmailName);
$displaySegmentInfo = false; $displaySegmentInfo = false;
$segmentInfo = null; $segmentInfo = null;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter