Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 21:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use plaintext for names and titles

Browse source
This commit is contained in:
Michael 2023-07-16 07:26:20 +00:00
parent 8bb33dccd1
commit 08dafd6d70
7 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Navigation/Notifications/Entity/Notify.php
View file

@ -118,7 +118,7 @@ class Notify extends BaseEntity
public function updateMsgFromPreamble($epreamble)
{
$this->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $this->link->__toString()]);
$this->msg_cache = self::formatMessage($this->name_cache, strip_tags(BBCode::convertForUriId(0, $this->msg, BBCode::EXTERNAL)));
$this->msg_cache = self::formatMessage($this->name_cache, BBCode::toPlaintext($this->msg, false, true));
}
/**
@ -134,6 +134,6 @@ class Notify extends BaseEntity
*/
public static function formatMessage(string $name, string $message): string
{
return str_replace('{0}', '<span class="contactname">' . strip_tags(BBCode::convertForUriId(0, $name, BBCode::EXTERNAL)) . '</span>', htmlspecialchars($message));
return str_replace('{0}', '<span class="contactname">' . BBCode::toPlaintext($name, false, true) . '</span>', htmlspecialchars($message));
}
}

2
src/Navigation/Notifications/Factory/FormattedNotify.php
View file

@ -222,7 +222,7 @@ class FormattedNotify extends BaseFactory
$this->baseUrl . '/notify/' . $Notify->id,
Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO),
$Notify->url,
strip_tags(BBCode::toPlaintext($Notify->msg ?? '')),
BBCode::toPlaintext($Notify->msg ?? '', false, true),
DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'),
Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)),
$Notify->seen

2
src/Navigation/Notifications/Factory/Notify.php
View file

@ -68,7 +68,7 @@ class Notify extends BaseFactory implements ICanCreateFromTableRow
false,
$params['verb'] ?? '',
$params['otype'] ?? '',
substr(strip_tags(BBCode::convertForUriId($uri_id, $params['source_name'])), 0, 255),
substr(BBCode::toPlaintext($params['source_name'], false, true), 0, 255),
null,
null,
$item_id,