refs #8252 introduce new option noreply_email_name

2 files changed, 7 insertions, 2 deletions

diff --git a/config/global.ini.php b/config/global.ini.php
index 0c0c736e37..673af0adb2 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -360,6 +360,9 @@ language_cookie_name = piwik_lang
 ; standard email address displayed when sending emails
 noreply_email_address = "noreply@{DOMAIN}"
 
+; standard email name of the sender. If not set, a default will be used.
+noreply_email_name = ""
+
 ; feedback email address;
 ; when testing, use your own email address or "nobody"
 feedback_email_address = "feedback@piwik.org"
diff --git a/core/Mail.php b/core/Mail.php
index b44e01c341..22843b5a76 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -40,9 +40,11 @@ class Mail extends Zend_Mail
         /** @var Translator $translator */
         $translator = StaticContainer::get('Piwik\Translation\Translator');
 
-        if ($customLogo->isEnabled()) {
+        $fromEmailName = Config::getInstance()->General['noreply_email_name'];
+
+        if (empty($fromEmailName) && $customLogo->isEnabled()) {
             $fromEmailName = $translator->translate('CoreHome_WebAnalyticsReports');
-        } else {
+        } elseif (empty($fromEmailName)) {
             $fromEmailName = $translator->translate('ScheduledReports_PiwikReports');
         }