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

Merge pull request #4579 from annando/fix-diaspora-link

Browse source 
Links to Diaspora had sometimes been cut
This commit is contained in:
Hypolite Petovan 2018-03-11 09:41:12 -04:00 committed by GitHub
parent 0e6ada2462 fbb38837b0
commit efedc5c2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/Content/Text/BBCode.php
View file

@ -754,7 +754,7 @@ class BBCode
if (($data["url"] != "") && ($data["title"] != "")) {
$text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
} elseif (($data["url"] != "")) {
$text .= "\n" . $data["url"];
$text .= "\n[url]" . $data["url"] . "[/url]";
}
return $text . "\n" . $data["after"];
@ -831,6 +831,48 @@ class BBCode
}
}
/**
* @brief Shortens [url] BBCodes in a format that looks less ugly than the full address. (callback function)
* @param array $match Array with the matching values
* @return string reformatted link including HTML codes
*/
private static function shortenVisibleUrlCallback($match)
{
$url = $match[1];
if (isset($match[2]) && ($match[1] != $match[2])) {
return $match[0];
}
$parts = parse_url($url);
if (!isset($parts['scheme'])) {
return $match[0];
}
return self::shortenVisibleUrl($url);
}
/**
* @brief Shortens [url] BBCodes in a format that looks less ugly than the full address.
* @param string $url URL that is about to be reformatted
* @return string reformatted link including HTML codes
*/
private static function shortenVisibleUrl($url)
{
$parts = parse_url($url);
$scheme = $parts['scheme'] . '://';
$styled_url = str_replace($scheme, '', $url);
// Currently deactivated, due to preview problems inside of Diaspora
// if (strlen($styled_url) > 30) {
// $styled_url = substr($styled_url, 0, 30) . "…";
// }
$html = '<a href="%s" target="_blank">%s</a>';
return sprintf($html, $url, $styled_url);
}
/*
* [noparse][i]italic[/i][/noparse] turns into
* [noparse][ i ]italic[ /i ][/noparse],
@ -1459,6 +1501,9 @@ class BBCode
if ($simple_html == 7) {
$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForMastodonCallback', $text);
$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForMastodonCallback', $text);
} else {
$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text);
$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text);
}
} else {
$text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $text);