Introduce NotifyEmailBuilder

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

diff --git a/src/Util/EMailer/SystemMailBuilder.php b/src/Util/EMailer/SystemMailBuilder.php
index 41d758ba0a3a173f9cf8d37e041609405ff1a8b5..24c1593c98dfbb43fd7b0195e785371ee32c6c41 100644 (file)
--- a/src/Util/EMailer/SystemMailBuilder.php
+++ b/src/Util/EMailer/SystemMailBuilder.php
@@ -3,13 +3,13 @@
 namespace Friendica\Util\EMailer;
 
 use Exception;
-use Friendica\App;
 use Friendica\App\BaseURL;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Builder for system-wide emails without any dependency to concrete entities (like items, activities, ..)
@@ -26,11 +26,10 @@ class SystemMailBuilder extends MailBuilder
        /** @var string */
        protected $siteAdmin;
 
-       public function __construct(App $a, 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);
@@ -38,7 +37,10 @@ class SystemMailBuilder extends MailBuilder
                        $this->siteAdmin = $l10n->t('%s Administrator', $siteName);
                }
 
-               $this->senderAddress = $a->getSenderEmailAddress();
+               // Set the system wide site address/name as sender (default for system mails)
+               $this->senderName    = $siteName;
+               $this->senderAddress = $siteEmailAddress;
+               $this->senderNoReply = $siteEmailAddress;
        }
 
        /**
@@ -109,15 +111,4 @@ class SystemMailBuilder extends MailBuilder
                        '$textversion' => $textVersion,
                ]);
        }
-
-       /**
-        * {@inheritDoc}
-        */
-       public function build(bool $raw = false)
-       {
-               // for system emails, always use the sitename/site address as the sender
-               $this->withSender($this->config->get('config', 'sitename'), $this->senderAddress);
-
-               return parent::build($raw);
-       }
 }