Merge pull request #11129 from urbalazs/copyright-2022

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

diff --git a/src/Util/EMailer/MailBuilder.php b/src/Util/EMailer/MailBuilder.php
index 6a7412f683d74c7356ed91897667cae9b64270db..6e892cf254575e5f6c4d2165ceeb133a058e961c 100644 (file)
--- a/src/Util/EMailer/MailBuilder.php
+++ b/src/Util/EMailer/MailBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,11 +23,11 @@ namespace Friendica\Util\EMailer;
 
 use Exception;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Model\User;
-use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\UnprocessableEntityException;
 use Friendica\Object\Email;
 use Friendica\Object\EMail\IEmail;
 use Psr\Log\LoggerInterface;
@@ -42,7 +42,7 @@ abstract class MailBuilder
 
        /** @var L10n */
        protected $l10n;
-       /** @var IConfig */
+       /** @var IManageConfigValues */
        protected $config;
        /** @var BaseURL */
        protected $baseUrl;
@@ -64,7 +64,7 @@ abstract class MailBuilder
        /** @var int */
        protected $recipientUid = null;
 
-       public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger)
+       public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger)
        {
                $this->l10n    = $l10n;
                $this->baseUrl = $baseUrl;
@@ -159,6 +159,36 @@ abstract class MailBuilder
                return $this;
        }
 
+       /**
+        * Returns the current headers
+        *
+        * @return string[][]
+        */
+       public function getHeaders()
+       {
+               return $this->headers;
+       }
+
+       /**
+        * Sets the headers
+        *
+        * Expected format is
+        * [
+        *   'Header1' => ['value1', 'value2', ...],
+        *   'Header2' => ['value3', 'value4', ...],
+        *   ...
+        * ]
+        *
+        * @param string[][] $headers
+        * @return $this
+        */
+       public function withHeaders(array $headers)
+       {
+               $this->headers = $headers;
+
+               return $this;
+       }
+
        /**
         * Adds a value to a header
         *
@@ -184,8 +214,7 @@ abstract class MailBuilder
         */
        public function setHeader(string $name, string $value)
        {
-               $this->headers[$name] = [];
-               $this->headers[$name][] = $value;
+               $this->headers[$name] = [$value];
 
                return $this;
        }
@@ -197,7 +226,7 @@ abstract class MailBuilder
         *
         * @return IEmail A new generated email
         *
-        * @throws InternalServerErrorException
+        * @throws UnprocessableEntityException
         * @throws Exception
         */
        public function build(bool $raw = false)
@@ -212,11 +241,11 @@ abstract class MailBuilder
                }
 
                if (empty($this->recipientAddress)) {
-                       throw new InternalServerErrorException('Recipient address is missing.');
+                       throw new UnprocessableEntityException('Recipient address is missing.');
                }
 
                if (empty($this->senderAddress) || empty($this->senderName)) {
-                       throw new InternalServerErrorException('Sender address or name is missing.');
+                       throw new UnprocessableEntityException('Sender address or name is missing.');
                }
 
                $this->senderNoReply = $this->senderNoReply ?? $this->senderAddress;