Move link conversion to the end of BBCode::convert
- Addresses https://github.com/friendica/friendica/issues/7271 - Add related tests
This commit is contained in:
Hypolite Petovan
parent
dc95d7c4f0
commit
38311a4a02
|
|
@ -1289,123 +1289,8 @@ class BBCode extends BaseObject
|
||||||
// Handle attached links or videos
|
// Handle attached links or videos
|
||||||
$text = self::convertAttachment($text, $simple_html, $try_oembed);
|
$text = self::convertAttachment($text, $simple_html, $try_oembed);
|
||||||
|
|
||||||
// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
|
|
||||||
if (!$for_plaintext) {
|
|
||||||
$text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
|
|
||||||
if (in_array($simple_html, [7, 9])) {
|
|
||||||
$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
|
|
||||||
$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $text);
|
|
||||||
$text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::removePictureLinksCallback', $text);
|
|
||||||
}
|
|
||||||
|
|
||||||
$text = str_replace(["\r","\n"], ['<br />', '<br />'], $text);
|
|
||||||
|
|
||||||
// Remove all hashtag addresses
|
|
||||||
if ((!$try_oembed || $simple_html) && !in_array($simple_html, [3, 7, 9])) {
|
|
||||||
$text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $text);
|
|
||||||
} elseif ($simple_html == 3) {
|
|
||||||
// The ! is converted to @ since Diaspora only understands the @
|
|
||||||
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
|
||||||
'@<a href="$2">$3</a>',
|
|
||||||
$text);
|
|
||||||
} elseif (in_array($simple_html, [7, 9])) {
|
|
||||||
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
|
||||||
'$1<span class="vcard"><a href="$2" class="url u-url mention" title="$3"><span class="fn nickname mention">$3</span></a></span>',
|
|
||||||
$text);
|
|
||||||
} elseif (!$simple_html) {
|
|
||||||
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
|
||||||
'$1<a href="$2" class="userinfo mention" title="$3">$3</a>',
|
|
||||||
$text);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bookmarks in red - will be converted to bookmarks in friendica
|
|
||||||
$text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text);
|
|
||||||
$text = preg_replace("/#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text);
|
|
||||||
$text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
|
|
||||||
"[bookmark=$1]$2[/bookmark]", $text);
|
|
||||||
|
|
||||||
if (in_array($simple_html, [2, 6, 7, 8])) {
|
|
||||||
$text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "self::expandLinksCallback", $text);
|
|
||||||
//$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
|
|
||||||
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$text);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($simple_html == 5) {
|
|
||||||
$text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $text);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Perform URL Search
|
|
||||||
if ($try_oembed) {
|
|
||||||
$text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $try_oembed_callback, $text);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($simple_html == 5) {
|
|
||||||
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $text);
|
|
||||||
} else {
|
|
||||||
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $text);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle Diaspora posts
|
|
||||||
$text = preg_replace_callback(
|
|
||||||
"&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
|
|
||||||
function ($match) {
|
|
||||||
return "[url=" . System::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]";
|
|
||||||
}, $text
|
|
||||||
);
|
|
||||||
|
|
||||||
$text = preg_replace_callback(
|
|
||||||
"&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
|
|
||||||
function ($match) {
|
|
||||||
return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
|
|
||||||
}, $text
|
|
||||||
);
|
|
||||||
|
|
||||||
// Server independent link to posts and comments
|
|
||||||
// See issue: https://github.com/diaspora/diaspora_federation/issues/75
|
|
||||||
$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
|
|
||||||
$text = preg_replace($expression, System::baseUrl()."/display/$1", $text);
|
|
||||||
|
|
||||||
/* Tag conversion
|
|
||||||
* Supports:
|
|
||||||
* - #[url=<anything>]<term>[/url]
|
|
||||||
* - [url=<anything>]#<term>[/url]
|
|
||||||
*/
|
|
||||||
$text = preg_replace_callback("/(?:#\[url\=[$URLSearchString]*\]|\[url\=[$URLSearchString]*\]#)(.*?)\[\/url\]/ism", function($matches) {
|
|
||||||
return '#<a href="'
|
|
||||||
. System::baseUrl() . '/search?tag=' . rawurlencode($matches[1])
|
|
||||||
. '" class="tag" title="' . XML::escape($matches[1]) . '">'
|
|
||||||
. XML::escape($matches[1])
|
|
||||||
. '</a>';
|
|
||||||
}, $text);
|
|
||||||
|
|
||||||
// We need no target="_blank" for local links
|
|
||||||
// convert links start with System::baseUrl() as local link without the target="_blank" attribute
|
|
||||||
$escapedBaseUrl = preg_quote(System::baseUrl(), '/');
|
|
||||||
$text = preg_replace("/\[url\](".$escapedBaseUrl."[$URLSearchString]*)\[\/url\]/ism", '<a href="$1">$1</a>', $text);
|
|
||||||
$text = preg_replace("/\[url\=(".$escapedBaseUrl."[$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1">$2</a>', $text);
|
|
||||||
|
|
||||||
$text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $text);
|
|
||||||
$text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
|
|
||||||
|
|
||||||
// Red compatibility, though the link can't be authenticated on Friendica
|
|
||||||
$text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
|
|
||||||
|
|
||||||
|
|
||||||
// we may need to restrict this further if it picks up too many strays
|
|
||||||
// link acct:user@host to a webfinger profile redirector
|
|
||||||
|
|
||||||
$text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . System::baseUrl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $text);
|
|
||||||
|
|
||||||
// Perform MAIL Search
|
|
||||||
$text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $text);
|
|
||||||
$text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $text);
|
|
||||||
|
|
||||||
// leave open the posibility of [map=something]
|
// leave open the posibility of [map=something]
|
||||||
// this is replaced in Item::prepareBody() which has knowledge of the item location
|
// this is replaced in Item::prepareBody() which has knowledge of the item location
|
||||||
|
|
||||||
if (strpos($text, '[/map]') !== false) {
|
if (strpos($text, '[/map]') !== false) {
|
||||||
$text = preg_replace_callback(
|
$text = preg_replace_callback(
|
||||||
"/\[map\](.*?)\[\/map\]/ism",
|
"/\[map\](.*?)\[\/map\]/ism",
|
||||||
|
|
@ -1415,6 +1300,7 @@ class BBCode extends BaseObject
|
||||||
$text
|
$text
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strpos($text, '[map=') !== false) {
|
if (strpos($text, '[map=') !== false) {
|
||||||
$text = preg_replace_callback(
|
$text = preg_replace_callback(
|
||||||
"/\[map=(.*?)\]/ism",
|
"/\[map=(.*?)\]/ism",
|
||||||
|
|
@ -1424,6 +1310,7 @@ class BBCode extends BaseObject
|
||||||
$text
|
$text
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strpos($text, '[map]') !== false) {
|
if (strpos($text, '[map]') !== false) {
|
||||||
$text = preg_replace("/\[map\]/", '<p class="map"></p>', $text);
|
$text = preg_replace("/\[map\]/", '<p class="map"></p>', $text);
|
||||||
}
|
}
|
||||||
|
|
@ -1706,6 +1593,120 @@ class BBCode extends BaseObject
|
||||||
$text = Smilies::replace($text);
|
$text = Smilies::replace($text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
|
||||||
|
if (!$for_plaintext) {
|
||||||
|
$text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
|
||||||
|
if (in_array($simple_html, [7, 9])) {
|
||||||
|
$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
|
||||||
|
$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $text);
|
||||||
|
$text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::removePictureLinksCallback', $text);
|
||||||
|
}
|
||||||
|
|
||||||
|
$text = str_replace(["\r","\n"], ['<br />', '<br />'], $text);
|
||||||
|
|
||||||
|
// Remove all hashtag addresses
|
||||||
|
if ((!$try_oembed || $simple_html) && !in_array($simple_html, [3, 7, 9])) {
|
||||||
|
$text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $text);
|
||||||
|
} elseif ($simple_html == 3) {
|
||||||
|
// The ! is converted to @ since Diaspora only understands the @
|
||||||
|
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
||||||
|
'@<a href="$2">$3</a>',
|
||||||
|
$text);
|
||||||
|
} elseif (in_array($simple_html, [7, 9])) {
|
||||||
|
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
||||||
|
'$1<span class="vcard"><a href="$2" class="url u-url mention" title="$3"><span class="fn nickname mention">$3</span></a></span>',
|
||||||
|
$text);
|
||||||
|
} elseif (!$simple_html) {
|
||||||
|
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
||||||
|
'$1<a href="$2" class="userinfo mention" title="$3">$3</a>',
|
||||||
|
$text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bookmarks in red - will be converted to bookmarks in friendica
|
||||||
|
$text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text);
|
||||||
|
$text = preg_replace("/#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text);
|
||||||
|
$text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
|
||||||
|
"[bookmark=$1]$2[/bookmark]", $text);
|
||||||
|
|
||||||
|
if (in_array($simple_html, [2, 6, 7, 8])) {
|
||||||
|
$text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "self::expandLinksCallback", $text);
|
||||||
|
//$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
|
||||||
|
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$text);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($simple_html == 5) {
|
||||||
|
$text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Perform URL Search
|
||||||
|
if ($try_oembed) {
|
||||||
|
$text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $try_oembed_callback, $text);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($simple_html == 5) {
|
||||||
|
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $text);
|
||||||
|
} else {
|
||||||
|
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle Diaspora posts
|
||||||
|
$text = preg_replace_callback(
|
||||||
|
"&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
|
||||||
|
function ($match) {
|
||||||
|
return "[url=" . System::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]";
|
||||||
|
}, $text
|
||||||
|
);
|
||||||
|
|
||||||
|
$text = preg_replace_callback(
|
||||||
|
"&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
|
||||||
|
function ($match) {
|
||||||
|
return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
|
||||||
|
}, $text
|
||||||
|
);
|
||||||
|
|
||||||
|
// Server independent link to posts and comments
|
||||||
|
// See issue: https://github.com/diaspora/diaspora_federation/issues/75
|
||||||
|
$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
|
||||||
|
$text = preg_replace($expression, System::baseUrl()."/display/$1", $text);
|
||||||
|
|
||||||
|
/* Tag conversion
|
||||||
|
* Supports:
|
||||||
|
* - #[url=<anything>]<term>[/url]
|
||||||
|
* - [url=<anything>]#<term>[/url]
|
||||||
|
*/
|
||||||
|
$text = preg_replace_callback("/(?:#\[url\=[$URLSearchString]*\]|\[url\=[$URLSearchString]*\]#)(.*?)\[\/url\]/ism", function($matches) {
|
||||||
|
return '#<a href="'
|
||||||
|
. System::baseUrl() . '/search?tag=' . rawurlencode($matches[1])
|
||||||
|
. '" class="tag" title="' . XML::escape($matches[1]) . '">'
|
||||||
|
. XML::escape($matches[1])
|
||||||
|
. '</a>';
|
||||||
|
}, $text);
|
||||||
|
|
||||||
|
// We need no target="_blank" for local links
|
||||||
|
// convert links start with System::baseUrl() as local link without the target="_blank" attribute
|
||||||
|
$escapedBaseUrl = preg_quote(System::baseUrl(), '/');
|
||||||
|
$text = preg_replace("/\[url\](".$escapedBaseUrl."[$URLSearchString]*)\[\/url\]/ism", '<a href="$1">$1</a>', $text);
|
||||||
|
$text = preg_replace("/\[url\=(".$escapedBaseUrl."[$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1">$2</a>', $text);
|
||||||
|
|
||||||
|
$text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $text);
|
||||||
|
$text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
|
||||||
|
|
||||||
|
// Red compatibility, though the link can't be authenticated on Friendica
|
||||||
|
$text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
|
||||||
|
|
||||||
|
|
||||||
|
// we may need to restrict this further if it picks up too many strays
|
||||||
|
// link acct:user@host to a webfinger profile redirector
|
||||||
|
|
||||||
|
$text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . System::baseUrl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $text);
|
||||||
|
|
||||||
|
// Perform MAIL Search
|
||||||
|
$text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $text);
|
||||||
|
$text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $text);
|
||||||
|
|
||||||
// Unhide all [noparse] contained bbtags unspacefying them
|
// Unhide all [noparse] contained bbtags unspacefying them
|
||||||
// and triming the [noparse] tag.
|
// and triming the [noparse] tag.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -134,4 +134,47 @@ class BBCodeTest extends MockedTest
|
||||||
$this->assertNotEquals($assert, $output);
|
$this->assertNotEquals($assert, $output);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function dataBBCodes()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'bug-7271-condensed-space' => [
|
||||||
|
'expectedHtml' => '<ul class="listdecimal" style="list-style-type: decimal;"><li> <a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
|
||||||
|
'text' => '[ol][*] http://example.com/[/ol]',
|
||||||
|
],
|
||||||
|
'bug-7271-condensed-nospace' => [
|
||||||
|
'expectedHtml' => '<ul class="listdecimal" style="list-style-type: decimal;"><li><a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
|
||||||
|
'text' => '[ol][*]http://example.com/[/ol]',
|
||||||
|
],
|
||||||
|
'bug-7271-indented-space' => [
|
||||||
|
'expectedHtml' => '<ul class="listbullet" style="list-style-type: circle;"><li> <a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
|
||||||
|
'text' => '[ul]
|
||||||
|
[*] http://example.com/
|
||||||
|
[/ul]',
|
||||||
|
],
|
||||||
|
'bug-7271-indented-nospace' => [
|
||||||
|
'expectedHtml' => '<ul class="listbullet" style="list-style-type: circle;"><li><a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
|
||||||
|
'text' => '[ul]
|
||||||
|
[*]http://example.com/
|
||||||
|
[/ul]',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test convert bbcodes to HTML
|
||||||
|
* @dataProvider dataBBCodes
|
||||||
|
*
|
||||||
|
* @param string $expectedHtml Expected HTML output
|
||||||
|
* @param string $text BBCode text
|
||||||
|
* @param int $simpleHtml BBCode::convert method $simple_html parameter value, optional.
|
||||||
|
* @param bool $forPlaintext BBCode::convert method $for_plaintext parameter value, optional.
|
||||||
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
|
*/
|
||||||
|
public function testConvert($expectedHtml, $text, $simpleHtml = 0, $forPlaintext = false)
|
||||||
|
{
|
||||||
|
$actual = BBCode::convert($text, false, $simpleHtml, $forPlaintext);
|
||||||
|
|
||||||
|
$this->assertEquals($expectedHtml, $actual);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user