bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Optimize "withMessage()" default

Browse source
This commit is contained in:
nupplaPhil 2020-03-07 12:48:25 +01:00
parent 6730ddfd99
commit 1d15f6f848
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Util/EMailer/SystemMailBuilder.php
View file

@ -40,7 +40,7 @@ class SystemMailBuilder extends MailBuilder
/** @var string */
protected $preamble = '';
/** @var string */
protected $body = null;
protected $body = '';
/** @var string */
protected $siteAdmin;
@ -65,11 +65,11 @@ class SystemMailBuilder extends MailBuilder
*
* @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 $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;
@ -94,15 +94,13 @@ class SystemMailBuilder extends MailBuilder
*/
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::convert($this->body),
]);
}
@ -113,15 +111,13 @@ class SystemMailBuilder extends MailBuilder
*/
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),
]);
}
}