Merge pull request #11129 from urbalazs/copyright-2022

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

diff --git a/src/Util/EMailer/NotifyMailBuilder.php b/src/Util/EMailer/NotifyMailBuilder.php
index ca2add0cac74d08cdd468b31a96043ebd66c24f5..6e25dcbb10c3533ff7903b3aefd6a6cae1ed5dea 100644 (file)
--- a/src/Util/EMailer/NotifyMailBuilder.php
+++ b/src/Util/EMailer/NotifyMailBuilder.php
@@ -1,22 +1,52 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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\EMailer;
 
 use Exception;
 use Friendica\App\BaseURL;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Builder for notification emails (notification, source, links, ...)
  */
-class NotifyMailBuilder extends SystemMailBuilder
+class NotifyMailBuilder extends MailBuilder
 {
+       /** @var string */
+       protected $subject;
+       /** @var string */
+       protected $preamble;
+       /** @var string */
+       protected $body;
+
+       /** @var string */
+       protected $siteAdmin;
+
        /** @var bool */
-       private $contentAllowed = true;
+       private $contentAllowed = false;
        /** @var string */
        private $title = '';
        /** @var array Details to print a photo:
@@ -40,12 +70,21 @@ class NotifyMailBuilder extends SystemMailBuilder
        /** @var string The item link */
        private $itemLink = '';
 
-       public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, string $siteEmailAddress, string $siteName)
+       public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger, string $siteEmailAddress, string $siteName)
        {
-               parent::__construct($l10n, $baseUrl, $config, $siteEmailAddress, $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->withSender($siteName, $siteEmailAddress, $siteEmailAddress);
 
                // check whether sending post content in email notifications is allowed
-               $this->contentAllowed = $this->config->get('system', 'enotify_no_content');
+               $this->contentAllowed = !$this->config->get('system', 'enotify_no_content', false);
        }
 
        /**
@@ -60,9 +99,16 @@ class NotifyMailBuilder extends SystemMailBuilder
         */
        public function withNotification(string $subject, string $preamble, string $title, string $body = null)
        {
+               if (!isset($body)) {
+                       $body = $preamble;
+               }
+
                $this->title = stripslashes($title);
+               $this->subject  = $subject;
+               $this->preamble = $preamble;
+               $this->body     = $body;
 
-               return $this->withMessage($subject, $preamble, $body);
+               return $this;
        }
 
        /**