Merge pull request #10086 from nupplaphil/feat/install_testrewrite

[friendica.git] / src / Object / Email.php

diff --git a/src/Object/Email.php b/src/Object/Email.php
index 96a7ad88cb18f9e3af33d80ac74e7bbe3cf41a03..62a6d4622433470438b93c677d921a0d2112b7a8 100644 (file)
--- a/src/Object/Email.php
+++ b/src/Object/Email.php
@@ -47,14 +47,14 @@ class Email implements IEmail
        /** @var string */
        private $msgText;
 
-       /** @var string */
-       private $additionalMailHeader = '';
+       /** @var string[][] */
+       private $additionalMailHeader;
        /** @var int|null */
-       private $toUid = null;
+       private $toUid;
 
        public function __construct(string $fromName, string $fromAddress, string $replyTo, string $toAddress,
                                    string $subject, string $msgHtml, string $msgText,
-                                   string $additionalMailHeader = '', int $toUid = null)
+                                   array $additionalMailHeader = [], int $toUid = null)
        {
                $this->fromName             = $fromName;
                $this->fromAddress          = $fromAddress;
@@ -127,6 +127,25 @@ class Email implements IEmail
                return $this->additionalMailHeader;
        }
 
+       /**
+        * {@inheritDoc}
+        */
+       public function getAdditionalMailHeaderString()
+       {
+               $headerString = '';
+
+               foreach ($this->additionalMailHeader as $name => $values) {
+                       if (is_array($values)) {
+                               foreach ($values as $value) {
+                                       $headerString .= "$name: $value\n";
+                               }
+                       } else {
+                               $headerString .= "$name: $values\n";
+                       }
+               }
+               return $headerString;
+       }
+
        /**
         * {@inheritDoc}
         */