<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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;
/** @var string */
protected $preamble = '';
/** @var string */
- protected $body = null;
+ 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);
/**
* 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 = '')
{
$this->subject = $subject;
$this->preamble = $preamble;
*/
protected function getHtmlMessage()
{
- $htmlVersion = !empty($this->body) ? 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),
]);
}
*/
protected function getPlaintextMessage()
{
- $textVersion = !empty($this->body) ? 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),
]);
}
}