<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
/** @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;
/**
* {@inheritDoc}
*/
- public function getMessage(bool $plain = false)
+ public function getMessage(bool $plain = false): string
{
if ($plain) {
return $this->msgText;
} else {
- return $this->msgHtml;
+ return $this->msgHtml ?? '';
}
}
return $this->additionalMailHeader;
}
+ /**
+ * {@inheritDoc}
+ */
+ public function getAdditionalMailHeaderString()
+ {
+ $headerString = '';
+
+ foreach ($this->additionalMailHeader as $name => $values) {
+ if (!is_array($values)) {
+ $values = [$values];
+ }
+
+ foreach ($values as $value) {
+ $headerString .= "$name: $value\r\n";
+ }
+ }
+
+ return $headerString;
+ }
+
/**
* {@inheritDoc}
*/
/**
* @inheritDoc
*/
+ #[\ReturnTypeWillChange]
public function jsonSerialize()
{
return $this->toArray();