Introduce NotifyEmailBuilder

[friendica.git] / src / Util / EMailer / SystemMailBuilder.php

diff --git a/src/Util/EMailer/SystemMailBuilder.php b/src/Util/EMailer/SystemMailBuilder.php
index 56ae620ec94686d1b97dff7b02de132cd35605a6..24c1593c98dfbb43fd7b0195e785371ee32c6c41 100644 (file)
--- a/src/Util/EMailer/SystemMailBuilder.php
+++ b/src/Util/EMailer/SystemMailBuilder.php
@@ -9,7 +9,7 @@ use Friendica\Core\Config\IConfig;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Util\Emailer;
+use Psr\Log\LoggerInterface;
 
 /**
  * Builder for system-wide emails without any dependency to concrete entities (like items, activities, ..)
@@ -26,17 +26,21 @@ class SystemMailBuilder extends MailBuilder
        /** @var string */
        protected $siteAdmin;
 
-       public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config)
+       public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger,
+                                   string $siteEmailAddress, string $siteName)
        {
-               parent::__construct($l10n, $baseUrl, $config);
-
-               $siteName = $this->config->get('config', 'sitename');
+               parent::__construct($l10n, $baseUrl, $config, $logger);
 
                if ($this->config->get('config', 'admin_name')) {
                        $this->siteAdmin = $l10n->t('%1$s, %2$s Administrator', $this->config->get('config', 'admin_name'), $siteName);
                } else {
                        $this->siteAdmin = $l10n->t('%s Administrator', $siteName);
                }
+
+               // Set the system wide site address/name as sender (default for system mails)
+               $this->senderName    = $siteName;
+               $this->senderAddress = $siteEmailAddress;
+               $this->senderNoReply = $siteEmailAddress;
        }
 
        /**