Merge pull request #8898 from annando/spool-log

[friendica.git] / src / Util / Emailer.php

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 485857b9d7f8fd131e826be519f1e21dcf2c882e..717366248f7a9f11e332c345809c99612cbd8f5c 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Util/Emailer.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Util;
 
 use Friendica\App;
@@ -12,6 +29,7 @@ use Friendica\Core\PConfig\IPConfig;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Object\EMail\IEmail;
 use Friendica\Protocol\Email;
+use Friendica\Util\EMailer\NotifyMailBuilder;
 use Friendica\Util\EMailer\SystemMailBuilder;
 use Psr\Log\LoggerInterface;
 
@@ -28,21 +46,25 @@ class Emailer
        private $logger;
        /** @var App\BaseURL */
        private $baseUrl;
+       /** @var L10n */
+       private $l10n;
 
        /** @var string */
        private $siteEmailAddress;
        /** @var string */
        private $siteEmailName;
 
-       public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger)
+       public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger,
+                                   L10n $defaultLang)
        {
                $this->config      = $config;
                $this->pConfig     = $pConfig;
                $this->logger      = $logger;
                $this->baseUrl     = $baseURL;
+               $this->l10n        = $defaultLang;
 
                $this->siteEmailAddress = $this->config->get('config', 'sender_email');
-               if (empty($sysEmailAddress)) {
+               if (empty($this->siteEmailAddress)) {
                        $hostname = $this->baseUrl->getHostname();
                        if (strpos($hostname, ':')) {
                                $hostname = substr($hostname, 0, strpos($hostname, ':'));
@@ -77,13 +99,22 @@ class Emailer
        /**
         * Creates a new system email
         *
-        * @param L10n $l10n The chosen language for the new email
-        *
         * @return SystemMailBuilder
         */
-       public function newSystemMail(L10n $l10n)
+       public function newSystemMail()
+       {
+               return new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger,
+                       $this->getSiteEmailAddress(), $this->getSiteEmailName());
+       }
+
+       /**
+        * Creates a new mail for notifications
+        *
+        * @return NotifyMailBuilder
+        */
+       public function newNotifyMail()
        {
-               return new SystemMailBuilder($l10n, $this->baseUrl, $this->config,
+               return new NotifyMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger,
                        $this->getSiteEmailAddress(), $this->getSiteEmailName());
        }