nupplaPhil/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1039 from MrPetovan/bug/9486-markdown-escape-mentions

Browse source 
[markdown] Escape mentions which username can contain Markdown-like syntax
This commit is contained in:
Michael Vogel 2020-11-02 20:11:38 +01:00 committed by GitHub
parent ee8564fd06 05d2707d50
commit 4da668be69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
markdown/markdown.php
View file

@ -47,26 +47,17 @@ function markdown_post_local_start(App $a, &$request) {
return;
}
// Elements that shouldn't be parsed
$elements = ['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img', 'bookmark',
'audio', 'video', 'youtube', 'vimeo', 'attachment', 'iframe', 'map', 'mail'];
foreach ($elements as $element) {
$request['body'] = preg_replace_callback("/\[" . $element . "(.*?)\](.*?)\[\/" . $element . "\]/ism",
function ($match) use ($element) {
return '[' . $element . '-b64' . base64_encode($match[1]) . ']' . base64_encode($match[2]) . '[/b64-' . $element . ']';
},
$request['body']
);
// Escape elements that shouldn't be parsed
$request['body'] = \Friendica\Content\Text\BBCode::performWithEscapedTags(
$request['body'],
['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img', 'bookmark',
'audio', 'video', 'youtube', 'vimeo', 'attachment', 'iframe', 'map', 'mail'],
function ($body) {
// Escape mentions which username can contain Markdown-like characters
// See https://github.com/friendica/friendica/issues/9486
return \Friendica\Util\Strings::performWithEscapedBlocks($body, '/[@!][^@\s]+@[^\s]+\w/', function ($text) {
return Markdown::toBBCode($text);
});
}
$request['body'] = Markdown::toBBCode($request['body']);
foreach (array_reverse($elements) as $element) {
$request['body'] = preg_replace_callback("/\[" . $element . "-b64(.*?)\](.*?)\[\/b64-" . $element . "\]/ism",
function ($match) use ($element) {
return '[' . $element . base64_decode($match[1]) . ']' . base64_decode($match[2]) . '[/' . $element . ']';
},
$request['body']
);
}
}