\n";
+ // Transforms quoted tweets in rich attachments to avoid nested tweets
+ if (stripos(normalise_link($link), 'http://twitter.com/') === 0 && OEmbed::isAllowedURL($link)) {
+ try {
+ $oembed = OEmbed::getHTML($link, $preshare);
+ } catch (Exception $e) {
+ $oembed = sprintf('[bookmark=%s]%s[/bookmark]', $link, $preshare);
+ }
+
+ $text = $preshare . $oembed;
+ } else {
+ $text = trim($share[1]) . "\n";
+
+ $avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
+
+ $tpl = get_markup_template('shared_content.tpl');
+ $text .= replace_macros($tpl, [
+ '$profile' => $profile,
+ '$avatar' => $avatar,
+ '$author' => $author,
+ '$link' => $link,
+ '$posted' => $posted,
+ '$content' => trim($share[3])
+ ]);
+ }
break;
}
- return($text);
+
+ return $text;
}
function GetProfileUsername($profile, $username, $compact = false, $getnetwork = false) {
$twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile);
if ($twitter != $profile) {
- if ($getnetwork)
- return(NETWORK_TWITTER);
- elseif ($compact)
- return($twitter);
- else
- return($username." (".$twitter.")");
+ if ($getnetwork) {
+ return NETWORK_TWITTER;
+ } elseif ($compact) {
+ return $twitter;
+ } else {
+ return ($username . " (" . $twitter . ")");
+ }
}
$appnet = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1@alpha.app.net", $profile);
if ($appnet != $profile) {
- if ($getnetwork)
- return(NETWORK_APPNET);
- elseif ($compact)
- return($appnet);
- else
- return($username." (".$appnet.")");
+ if ($getnetwork) {
+ return NETWORK_APPNET;
+ } elseif ($compact) {
+ return $appnet;
+ } else {
+ return ($username . " (" . $appnet . ")");
+ }
}
$gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile);
if ($gplus != $profile) {
- if ($getnetwork)
- return(NETWORK_GPLUS);
- elseif ($compact)
- return($gplususername." (".$username.")");
- else
- return($username." (".$gplus.")");
+ if ($getnetwork) {
+ return NETWORK_GPLUS;
+ } elseif ($compact) {
+ return ($gplususername . " (" . $username . ")");
+ } else {
+ return ($username . " (" . $gplus . ")");
+ }
}
$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile);
if ($friendica != $profile) {
- if ($getnetwork)
- return(NETWORK_DFRN);
- elseif ($compact)
- return($friendica);
- else
- return($username." (".$friendica.")");
+ if ($getnetwork) {
+ return NETWORK_DFRN;
+ } elseif ($compact) {
+ return $friendica;
+ } else {
+ return ($username . " (" . $friendica . ")");
+ }
}
$diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
if ($diaspora != $profile) {
- if ($getnetwork)
- return(NETWORK_DIASPORA);
- elseif ($compact)
- return($diaspora);
- else
- return($username." (".$diaspora.")");
+ if ($getnetwork) {
+ return NETWORK_DIASPORA;
+ } elseif ($compact) {
+ return $diaspora;
+ } else {
+ return ($username . " (" . $diaspora . ")");
+ }
}
$red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile);
if ($red != $profile) {
- if ($getnetwork)
+ if ($getnetwork) {
// red is identified as Diaspora - friendica can't connect directly to it
- return(NETWORK_DIASPORA);
- elseif ($compact)
- return($red);
- else
- return($username." (".$red.")");
+ return NETWORK_DIASPORA;
+ } elseif ($compact) {
+ return $red;
+ } else {
+ return ($username . " (" . $red . ")");
+ }
}
$StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
if ($StatusnetHost != $profile) {
$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
if ($StatusnetUser != $profile) {
- $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
+ /// @TODO Some hosts run on https, not just http and sometimes http is disabled, let's support both here
+ $UserData = Network::fetchUrl("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
$user = json_decode($UserData);
if ($user) {
- if ($getnetwork)
- return(NETWORK_STATUSNET);
- elseif ($compact)
- return($user->screen_name."@".$StatusnetHost);
- else
- return($username." (".$user->screen_name."@".$StatusnetHost.")");
+ if ($getnetwork) {
+ return NETWORK_STATUSNET;
+ } elseif ($compact) {
+ return ($user->screen_name . "@" . $StatusnetHost);
+ } else {
+ return ($username . " (" . $user->screen_name . "@" . $StatusnetHost . ")");
+ }
}
}
}
@@ -590,28 +708,27 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
if ($rest == "") {
$pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$2@$1", $profile);
if ($pumpio != $profile) {
- if ($getnetwork)
- return(NETWORK_PUMPIO);
- elseif ($compact)
- return($pumpio);
- else
- return($username." (".$pumpio.")");
+ if ($getnetwork) {
+ return NETWORK_PUMPIO;
+ } elseif ($compact) {
+ return $pumpio;
+ } else {
+ return ($username . " (" . $pumpio . ")");
+ }
}
}
- return($username);
+ return $username;
}
function bb_DiasporaLinks($match) {
- $a = get_app();
-
- return "[url=".$a->get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
+ return "[url=".System::baseUrl()."/display/".$match[1]."]".$match[2]."[/url]";
}
function bb_RemovePictureLinks($match) {
$text = Cache::get($match[1]);
- if(is_null($text)){
+ if (is_null($text)) {
$a = get_app();
$stamp1 = microtime(true);
@@ -631,16 +748,14 @@ function bb_RemovePictureLinks($match) {
$text = "[url=".$match[2]."]".$match[2]."[/url]";
// if its not a picture then look if its a page that contains a picture link
- require_once("include/network.php");
-
- $body = fetch_url($match[1]);
+ $body = Network::fetchUrl($match[1]);
$doc = new DOMDocument();
@$doc->loadHTML($body);
$xpath = new DomXPath($doc);
$list = $xpath->query("//meta[@name]");
foreach ($list as $node) {
- $attr = array();
+ $attr = [];
if ($node->attributes->length)
foreach ($node->attributes as $attribute)
@@ -652,20 +767,22 @@ function bb_RemovePictureLinks($match) {
}
Cache::set($match[1],$text);
}
- return($text);
+
+ return $text;
}
function bb_expand_links($match) {
- if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3]))
- return ($match[1]."[url]".$match[2]."[/url]");
- else
- return ($match[1].$match[3]." [url]".$match[2]."[/url]");
+ if (($match[3] == "") || ($match[2] == $match[3]) || stristr($match[2], $match[3])) {
+ return ($match[1] . "[url]" . $match[2] . "[/url]");
+ } else {
+ return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]");
+ }
}
function bb_CleanPictureLinksSub($match) {
$text = Cache::get($match[1]);
- if(is_null($text)){
+ if (is_null($text)) {
$a = get_app();
$stamp1 = microtime(true);
@@ -686,16 +803,14 @@ function bb_CleanPictureLinksSub($match) {
$text = "[img]".$match[2]."[/img]";
// if its not a picture then look if its a page that contains a picture link
- require_once("include/network.php");
-
- $body = fetch_url($match[1]);
+ $body = Network::fetchUrl($match[1]);
$doc = new DOMDocument();
@$doc->loadHTML($body);
$xpath = new DomXPath($doc);
$list = $xpath->query("//meta[@name]");
foreach ($list as $node) {
- $attr = array();
+ $attr = [];
if ($node->attributes->length)
foreach ($node->attributes as $attribute)
@@ -707,27 +822,79 @@ function bb_CleanPictureLinksSub($match) {
}
Cache::set($match[1],$text);
}
- return($text);
+
+ return $text;
}
function bb_CleanPictureLinks($text) {
$text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_CleanPictureLinksSub', $text);
- return ($text);
+ return $text;
}
- // BBcode 2 HTML was written by WAY2WEB.net
- // extended to work with Mistpark/Friendica - Mike Macgirvin
-
-function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) {
+function bb_highlight($match) {
+ if (in_array(strtolower($match[1]), ['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby',
+ 'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh'])) {
+ return text_highlight($match[2], strtolower($match[1]));
+ }
+ return $match[0];
+}
+/**
+ * @brief Converts a BBCode message to HTML message
+ *
+ * BBcode 2 HTML was written by WAY2WEB.net
+ * extended to work with Mistpark/Friendica - Mike Macgirvin
+ *
+ * Simple HTML values meaning:
+ * - 0: Friendica display
+ * - 1: Unused
+ * - 2: Used for Facebook, Google+, Windows Phone push, Friendica API
+ * - 3: Used before converting to Markdown in bb2diaspora.php
+ * - 4: Used for WordPress, Libertree (before Markdown), pump.io and tumblr
+ * - 5: Unused
+ * - 6: Used for Appnet
+ * - 7: Used for dfrn, OStatus
+ * - 8: Used for WP backlink text setting
+ *
+ * @staticvar array $allowed_src_protocols
+ * @param string $Text
+ * @param bool $preserve_nl
+ * @param bool $tryoembed
+ * @param int $simplehtml
+ * @param bool $forplaintext
+ * @return string
+ */
+function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false)
+{
$a = get_app();
+ /*
+ * preg_match_callback function to replace potential Oembed tags with Oembed content
+ *
+ * $match[0] = [tag]$url[/tag] or [tag=$url]$title[/tag]
+ * $match[1] = $url
+ * $match[2] = $title or absent
+ */
+ $tryoembed_callback = function ($match)
+ {
+ $url = $match[1];
+ $title = defaults($match, 2, null);
+
+ try {
+ $return = OEmbed::getHTML($url, $title);
+ } catch (Exception $ex) {
+ $return = $match[0];
+ }
+
+ return $return;
+ };
+
// Hide all [noparse] contained bbtags by spacefying them
// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
- $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
- $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy',$Text);
- $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
+ $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy', $Text);
+ $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy', $Text);
+ $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy', $Text);
// Remove the abstract element. It is a non visible element.
$Text = remove_abstract($Text);
@@ -757,16 +924,22 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$Text = str_replace(">", ">", $Text);
// remove some newlines before the general conversion
- $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text);
- $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text);
+ $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "[share$1]$2[/share]", $Text);
+ $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "[quote$1]$2[/quote]", $Text);
$Text = preg_replace("/\n\[code\]/ism", "[code]", $Text);
$Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text);
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
- if (!$tryoembed)
- $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
+ if (!$tryoembed) {
+ $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1$2]$3[/share]", $Text);
+ }
+ // Check for [code] text here, before the linefeeds are messed with.
+ // The highlighter will unescape and re-escape the content.
+ if (strpos($Text, '[code=') !== false) {
+ $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text);
+ }
// Convert new line chars to html
tags
// nlbr seems to be hopelessly messed up
@@ -775,45 +948,68 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// We'll emulate it.
$Text = trim($Text);
- $Text = str_replace("\r\n","\n", $Text);
+ $Text = str_replace("\r\n", "\n", $Text);
// removing multiplicated newlines
- if (get_config("system", "remove_multiplicated_lines")) {
- $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
- "\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n");
- $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
- "[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]");
+ if (Config::get("system", "remove_multiplicated_lines")) {
+ $search = ["\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
+ "\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n"];
+ $replace = ["\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
+ "[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]"];
do {
$oldtext = $Text;
$Text = str_replace($search, $replace, $Text);
} while ($oldtext != $Text);
}
- // Handle attached links or videos
- $Text = bb_attachment($Text, $simplehtml, $tryoembed);
-
- $Text = str_replace(array("\r","\n"), array('
','
'), $Text);
-
- if($preserve_nl)
- $Text = str_replace(array("\n","\r"), array('',''),$Text);
-
// Set up the parameters for a URL search string
$URLSearchString = "^\[\]";
// Set up the parameters for a MAIL search string
$MAILSearchString = $URLSearchString;
+ // 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 (!$forplaintext) {
+ // Autolink feature (thanks to http://code.seebz.net/p/autolink-php/)
+ // Currently disabled, since the function is too greedy
+ // $autolink_regex = "`([^\]\=\"']|^)(https?\://[^\s<]+[^\s<\.\)])`ism";
+ $autolink_regex = "/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism";
+ $Text = preg_replace($autolink_regex, '$1[url]$2[/url]', $Text);
+ if ($simplehtml == 7) {
+ $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'bb_style_url', $Text);
+ $Text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'bb_style_url', $Text);
+ }
+ } else {
+ $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $Text);
+ $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
+ }
+
+
+ // Handle attached links or videos
+ $Text = bb_attachment($Text, $simplehtml, $tryoembed);
+
+ $Text = str_replace(["\r","\n"], ['
', '
'], $Text);
+
+ if ($preserve_nl) {
+ $Text = str_replace(["\n", "\r"], ['', ''], $Text);
+ }
+
// Remove all hashtag addresses
- if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7)))
- $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
- elseif ($simplehtml == 3)
- $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
- '$1
$3',
+ if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, [3, 7])) {
+ $Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+ } elseif ($simplehtml == 3) {
+ // The ! is converted to @ since Diaspora only understands the @
+ $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ '@
$3',
$Text);
- elseif ($simplehtml == 7)
- $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ } elseif ($simplehtml == 7) {
+ $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1
$3',
$Text);
-
+ } elseif (!$simplehtml) {
+ $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ '$1
$3',
+ $Text);
+ }
// Bookmarks in red - will be converted to bookmarks in friendica
$Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text);
@@ -821,39 +1017,40 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$Text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
"[bookmark=$1]$2[/bookmark]", $Text);
- if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
- $Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism","bb_expand_links",$Text);
- //$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism",' $2 [url]$1[/url]',$Text);
- $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",' $2 [url]$1[/url]',$Text);
+ if (in_array($simplehtml, [2, 6, 7, 8, 9])) {
+ $Text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
+ //$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
+ $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text);
}
- if ($simplehtml == 5)
- $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
+ if ($simplehtml == 5) {
+ $Text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
+ }
// Perform URL Search
- if ($tryoembed)
- $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'tryoembed',$Text);
+ if ($tryoembed) {
+ $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $tryoembed_callback, $Text);
+ }
- if ($simplehtml == 5)
- $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url]$1[/url]',$Text);
- else
- $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text);
+ if ($simplehtml == 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", 'bb_DiasporaLinks', $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 ($simplehtml != 7) {
- if (!$forplaintext)
- $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1
$2', $Text);
- else {
- $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text);
- $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $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);
+
+ $Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ '$1
$3', $Text);
- if ($tryoembed)
- $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
+ $Text = preg_replace("/\[url\=([$URLSearchString]*)\]#(.*?)\[\/url\]/ism",
+ '#
$2', $Text);
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '
$1', $Text);
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '
$2', $Text);
@@ -866,8 +1063,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// 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:(.*?)@(.*?)([ ,])/', '
acct:' . "$1@$2$3" . '',$Text);
+ $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '
acct:$1@$2', $Text);
// Perform MAIL Search
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '
$1', $Text);
@@ -876,58 +1072,61 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// leave open the posibility of [map=something]
// this is replaced in prepare_body() which has knowledge of the item location
- if (strpos($Text,'[/map]') !== false) {
+ if (strpos($Text, '[/map]') !== false) {
$Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text);
}
- if (strpos($Text,'[map=') !== false) {
+ if (strpos($Text, '[map=') !== false) {
$Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text);
}
- if (strpos($Text,'[map]') !== false) {
+ if (strpos($Text, '[map]') !== false) {
$Text = preg_replace("/\[map\]/", '
', $Text);
}
// Check for headers
- $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'
$1
',$Text);
- $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'
$1
',$Text);
- $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'
$1
',$Text);
- $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'
$1
',$Text);
- $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'
$1
',$Text);
- $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'
$1
',$Text);
+ $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism", '
$1
', $Text);
+ $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism", '
$1
', $Text);
+ $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism", '
$1
', $Text);
+ $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism", '
$1
', $Text);
+ $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism", '
$1
', $Text);
+ $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism", '
$1
', $Text);
+
+ // Check for paragraph
+ $Text = preg_replace("(\[p\](.*?)\[\/p\])ism", '
$1
', $Text);
// Check for bold text
- $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'
$1',$Text);
+ $Text = preg_replace("(\[b\](.*?)\[\/b\])ism", '
$1', $Text);
// Check for Italics text
- $Text = preg_replace("(\[i\](.*?)\[\/i\])ism",'
$1',$Text);
+ $Text = preg_replace("(\[i\](.*?)\[\/i\])ism", '
$1', $Text);
// Check for Underline text
- $Text = preg_replace("(\[u\](.*?)\[\/u\])ism",'
$1',$Text);
+ $Text = preg_replace("(\[u\](.*?)\[\/u\])ism", '
$1', $Text);
// Check for strike-through text
- $Text = preg_replace("(\[s\](.*?)\[\/s\])ism",'
$1',$Text);
+ $Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '
$1', $Text);
// Check for over-line text
- $Text = preg_replace("(\[o\](.*?)\[\/o\])ism",'
$1',$Text);
+ $Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '
$1', $Text);
// Check for colored text
- $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","
$2",$Text);
+ $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism", "
$2", $Text);
// Check for sized text
// [size=50] --> font-size: 50px (with the unit).
- $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","
$2",$Text);
- $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","
$2",$Text);
+ $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "
$2", $Text);
+ $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism", "
$2", $Text);
// Check for centered text
- $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","
$1
",$Text);
+ $Text = preg_replace("(\[center\](.*?)\[\/center\])ism", "
$1
", $Text);
// Check for list text
$Text = str_replace("[*]", "
", $Text);
// Check for style sheet commands
- $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism","bb_cleanstyle",$Text);
+ $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism", "bb_cleanstyle", $Text);
// Check for CSS classes
- $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text);
+ $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism", "bb_cleanclass", $Text);
// handle nested lists
$endlessloop = 0;
@@ -936,42 +1135,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) ||
((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) ||
((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) {
- $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '' ,$Text);
- $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '' ,$Text);
- $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '' ,$Text);
- $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'' ,$Text);
- $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '' ,$Text);
- $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '' ,$Text);
- $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '' ,$Text);
- $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '' ,$Text);
- $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '' ,$Text);
- $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '$1' ,$Text);
+ $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '
', $Text);
+ $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '
', $Text);
+ $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '
', $Text);
+ $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '
$1', $Text);
}
- $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '
$1 | ' ,$Text);
- $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '
$1 | ' ,$Text);
- $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '
$1
' ,$Text);
- $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '
' ,$Text);
+ $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '
$1 | ', $Text);
+ $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '
$1 | ', $Text);
+ $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '
$1
', $Text);
+ $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '
', $Text);
- $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '
' ,$Text);
- $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '
' ,$Text);
+ $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '
', $Text);
+ $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '
', $Text);
- $Text = str_replace('[hr]','
', $Text);
+ $Text = str_replace('[hr]', '
', $Text);
// This is actually executed in prepare_body()
- $Text = str_replace('[nosmile]','',$Text);
+ $Text = str_replace('[nosmile]', '', $Text);
// Check for font change text
- $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm","
$2",$Text);
+ $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "
$2", $Text);
// Declare the format for [code] layout
-// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text);
+// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'stripcode_br_cb', $Text);
$CodeLayout = '
$1
';
// Check for [code] text
- $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism","$CodeLayout", $Text);
+ $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $Text);
// Declare the format for [spoiler] layout
$SpoilerLayout = '
$1
';
@@ -979,19 +1178,21 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// Check for [spoiler] text
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20))
- $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism","$SpoilerLayout", $Text);
+ while ((strpos($Text, "[/spoiler]") !== false) && (strpos($Text, "[spoiler]") !== false) && (++$endlessloop < 20)) {
+ $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text);
+ }
// Check for [spoiler=Author] text
- $t_wrote = t('$1 wrote:');
+ $t_wrote = L10n::t('$1 wrote:');
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20))
+ while ((strpos($Text, "[/spoiler]")!== false) && (strpos($Text, "[spoiler=") !== false) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
"
" . $t_wrote . "$2
",
$Text);
+ }
// Declare the format for [quote] layout
$QuoteLayout = '
$1
';
@@ -999,19 +1200,21 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// Check for [quote] text
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20))
- $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text);
+ while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote]") !== false) && (++$endlessloop < 20)) {
+ $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text);
+ }
// Check for [quote=Author] text
- $t_wrote = t('$1 wrote:');
+ $t_wrote = L10n::t('$1 wrote:');
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
+ while ((strpos($Text, "[/quote]")!== false) && (strpos($Text, "[quote=") !== false) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
"
" . $t_wrote . "$2
",
$Text);
+ }
// [img=widthxheight]image source[/img]
@@ -1024,27 +1227,26 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// [img]pathtoimage[/img]
$Text = preg_replace_callback("/\[img\](.*?)\[\/img\]/ism", 'bb_PictureCache', $Text);
- $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '
![' . t('Image/photo') . ']($1)
', $Text);
- $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '
![' . t('Image/photo') . ']($1)
', $Text);
+ $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '
![' . L10n::t('Image/photo') . ']($1)
', $Text);
+ $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '
![' . L10n::t('Image/photo') . ']($1)
', $Text);
// Shared content
$Text = preg_replace_callback("/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism",
- function ($match) use ($simplehtml){
- return(bb_ShareAttributes($match, $simplehtml));
- },$Text);
-
- $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
![' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
- $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
- //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
+ function ($match) use ($simplehtml) {
+ return bb_ShareAttributes($match, $simplehtml);
+ }, $Text);
+ $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
![' . L10n::t('Encrypted content') . ' ' . L10n::t('Encrypted content') . '](' .System::baseUrl() . '/images/lock_icon.gif)
', $Text);
+ $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
![' . '$1' . ' ' . L10n::t('Encrypted content') . ' ' . L10n::t('Encrypted content') . '](' .System::baseUrl() . '/images/lock_icon.gif)
', $Text);
+ //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
![' . '$1' . ' ' . L10n::t('Encrypted content') . ' ' . L10n::t('Encrypted content') . '](' .System::baseUrl() . '/images/lock_icon.gif)
', $Text);
// Try to Oembed
if ($tryoembed) {
- $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '
', $Text);
+ $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '
', $Text);
$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '
', $Text);
- $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
- $Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", 'tryoembed', $Text);
+ $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", $tryoembed_callback, $Text);
+ $Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", $tryoembed_callback, $Text);
} else {
$Text = preg_replace("/\[video\](.*?)\[\/video\]/",
'
$1', $Text);
@@ -1055,46 +1257,49 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// html5 video and audio
- if ($tryoembed)
+ if ($tryoembed) {
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '
', $Text);
- else
+ } else {
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '
$1', $Text);
+ }
// Youtube extensions
if ($tryoembed) {
- $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
- $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
- $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text);
+ $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", $tryoembed_callback, $Text);
+ $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", $tryoembed_callback, $Text);
+ $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", $tryoembed_callback, $Text);
}
- $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
- $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
- $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
+ $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
+ $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
+ $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
- if ($tryoembed)
+ if ($tryoembed) {
$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '
', $Text);
- else
+ } else {
$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
'
https://www.youtube.com/watch?v=$1', $Text);
+ }
if ($tryoembed) {
- $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text);
- $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text);
+ $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", $tryoembed_callback, $Text);
+ $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", $tryoembed_callback, $Text);
}
- $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
- $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
+ $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text);
+ $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text);
- if ($tryoembed)
+ if ($tryoembed) {
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '
', $Text);
- else
+ } else {
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
'
https://vimeo.com/$1', $Text);
+ }
// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '
', $Text);
// oembed tag
- $Text = oembed_bbcode2html($Text);
+ $Text = OEmbed::BBCode2HTML($Text);
// Avoid triple linefeeds through oembed
$Text = str_replace("
", "
", $Text);
@@ -1104,44 +1309,74 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// Summary (e.g. title) is required, earlier revisions only required description (in addition to
// start which is always required). Allow desc with a missing summary for compatibility.
- if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) {
+ if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
$sub = format_event_html($ev, $simplehtml);
- $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text);
- $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text);
- $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text);
- $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
- $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text);
- $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);
+ $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $Text);
+ $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $Text);
+ $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism", $sub, $Text);
+ $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism", '', $Text);
+ $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism", '', $Text);
+ $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism", '', $Text);
+ $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text);
}
+ // Replace non graphical smilies for external posts
+ if ($simplehtml) {
+ $Text = Smilies::replace($Text, false, true);
+ }
- //replace oneliner
with
- $Text = preg_replace_callback("|(?!
]*>)([^<]*)
(?!
]*>)|ism", 'bb_onelinecode_cb', $Text);
+ // Replace inline code blocks
+ $Text = preg_replace_callback("|(?!
]*>)([^<]*)
(?!
]*>)|ism",
+ function ($match) use ($simplehtml) {
+ $return = '' . $match[1] . '';
+ // Use for Diaspora inline code blocks
+ if ($simplehtml === 3) {
+ $return = '' . $match[1] . '
';
+ }
+ return $return;
+ }
+ , $Text);
// Unhide all [noparse] contained bbtags unspacefying them
// and triming the [noparse] tag.
- $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text);
- $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text);
- $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text);
+ $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text);
+ $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text);
+ $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text);
- $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text);
- $Text = preg_replace('/\&\#039\;/','\'',$Text);
- $Text = preg_replace('/\"\;/','"',$Text);
+ $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text);
+ $Text = preg_replace('/\&\#039\;/', '\'', $Text);
+ $Text = preg_replace('/\"\;/', '"', $Text);
// fix any escaped ampersands that may have been converted into links
- $Text = preg_replace("/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
- $Text = preg_replace("/\<([^>]*?)(src|href)=\"(?!http|ftp|mailto|gopher|cid)(.*?)\>/ism",'<$1$2="">',$Text);
+ $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text);
- if($saved_image)
+ // sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails)
+ static $allowed_src_protocols = ['http', 'redir', 'cid'];
+ $Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
+ '<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . L10n::t('Invalid source protocol') . '">', $Text);
+
+ // sanitize href attributes (only whitelisted protocols URLs)
+ // default value for backward compatibility
+ $allowed_link_protocols = Config::get('system', 'allowed_link_protocols', ['ftp', 'mailto', 'gopher', 'cid']);
+
+ // Always allowed protocol even if config isn't set or not including it
+ $allowed_link_protocols[] = 'http';
+ $allowed_link_protocols[] = 'redir/';
+
+ $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
+ $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 data-original-href="$3" class="invalid-href" title="' . L10n::t('Invalid link protocol') . '">', $Text);
+
+ if ($saved_image) {
$Text = bb_replace_images($Text, $saved_image);
+ }
// Clean up the HTML by loading and saving the HTML with the DOM.
// Bad structured html can break a whole page.
// For performance reasons do it only with ativated item cache or at export.
- if (!$tryoembed OR (get_itemcachepath() != "")) {
+ if (!$tryoembed || (get_itemcachepath() != "")) {
$doc = new DOMDocument();
$doc->preserveWhiteSpace = false;
@@ -1152,21 +1387,21 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
@$doc->loadHTML($encoding.$doctype."".$Text."");
$doc->encoding = 'UTF-8';
$Text = $doc->saveHTML();
- $Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $Text);
+ $Text = str_replace(["", "", $doctype, $encoding], ["", "", "", ""], $Text);
- $Text = str_replace('
','', $Text);
+ $Text = str_replace('
', '', $Text);
//$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
}
// Clean up some useless linebreaks in lists
- //$Text = str_replace('
', $Text);
- //$Text = str_replace('
','', $Text);
- //$Text = str_replace('
','', $Text);
- // $Text = str_replace('
', $Text);
+ //$Text = str_replace('
', '', $Text);
+ //$Text = str_replace('
', '', $Text);
+ //$Text = str_replace('