Changes:

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

diff --git a/src/Util/EMailer/SystemMailBuilder.php b/src/Util/EMailer/SystemMailBuilder.php
index 59ebb59b18f5528de6e18b5caae65321697f2fa0..702f4b14275a8484611b35216072eb52d7e67a84 100644 (file)
--- a/src/Util/EMailer/SystemMailBuilder.php
+++ b/src/Util/EMailer/SystemMailBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,7 +24,7 @@ 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;
@@ -36,16 +36,16 @@ use Psr\Log\LoggerInterface;
 class SystemMailBuilder extends MailBuilder
 {
        /** @var string */
-       protected $subject;
+       protected $subject = '';
        /** @var string */
-       protected $preamble;
+       protected $preamble = '';
        /** @var string */
-       protected $body;
+       protected $body = '';
 
        /** @var string */
        protected $siteAdmin;
 
-       public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger,
+       public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger,
                                    string $siteEmailAddress, string $siteName)
        {
                parent::__construct($l10n, $baseUrl, $config, $logger);
@@ -63,18 +63,14 @@ class SystemMailBuilder extends MailBuilder
        /**
         * Adds a message
         *
-        * @param string      $subject  The subject of the email
-        * @param string      $preamble The preamble of the email
-        * @param string|null $body     The body of the email (if not set, the preamble will get used as body)
+        * @param string $subject  The subject of the email
+        * @param string $preamble The preamble of the email
+        * @param string $body     The body of the email (optional)
         *
         * @return static
         */
-       public function withMessage(string $subject, string $preamble, string $body = null)
+       public function withMessage(string $subject, string $preamble, string $body = '')
        {
-               if (!isset($body)) {
-                       $body = $preamble;
-               }
-
                $this->subject  = $subject;
                $this->preamble = $preamble;
                $this->body     = $body;
@@ -98,15 +94,13 @@ class SystemMailBuilder extends MailBuilder
         */
        protected function getHtmlMessage()
        {
-               $htmlVersion = BBCode::convert($this->body);
-
                // load the template for private message notifications
                $tpl = Renderer::getMarkupTemplate('email/system/html.tpl');
                return Renderer::replaceMacros($tpl, [
                        '$preamble'    => str_replace("\n", "<br>\n", $this->preamble),
                        '$thanks'      => $this->l10n->t('thanks'),
                        '$site_admin'  => $this->siteAdmin,
-                       '$htmlversion' => $htmlVersion,
+                       '$htmlversion' => BBCode::convertForUriId(0, $this->body, BBCode::EXTERNAL),
                ]);
        }
 
@@ -117,15 +111,13 @@ class SystemMailBuilder extends MailBuilder
         */
        protected function getPlaintextMessage()
        {
-               $textVersion = BBCode::toPlaintext($this->body);
-
                // load the template for private message notifications
                $tpl = Renderer::getMarkupTemplate('email/system/text.tpl');
                return Renderer::replaceMacros($tpl, [
                        '$preamble'    => $this->preamble,
                        '$thanks'      => $this->l10n->t('thanks'),
                        '$site_admin'  => $this->siteAdmin,
-                       '$textversion' => $textVersion,
+                       '$textversion' => BBCode::toPlaintext($this->body),
                ]);
        }
 }