X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=8ccdfd981c1a2c3658762694b63ec82892ae5c4d;hb=56ee734b00aead633d5d213a6b140b75bc17ba96;hp=0d0cb0177c2f692b88d92f77a0c74e6ca9b3b831;hpb=979fc6d38a842373cfaf17b18daadea003761ed9;p=friendica.git diff --git a/include/bbcode.php b/include/bbcode.php index 0d0cb0177c..8ccdfd981c 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,41 +1,47 @@ ' . generate_map(str_replace('/',' ',$match[1])) . '', $match[0]); + return str_replace($match[0], '
".$match[1]."
";
-}
-
-function tryoembed($match){
+function tryoembed($match) {
$url = $match[1];
// Always embed the SSL version
$url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
-
$o = oembed_fetch_url($url);
- if (!is_object($o))
+ if (!is_object($o)) {
return $match[0];
+ }
- if (isset($match[2]))
+ if (isset($match[2])) {
$o->title = $match[2];
+ }
- if ($o->type=="error") return $match[0];
+ if ($o->type == "error") {
+ return $match[0];
+ }
$html = oembed_format_object($o);
- return $html;
+ return $html;
}
-// [noparse][i]italic[/i][/noparse] turns into
-// [noparse][ i ]italic[ /i ][/noparse],
-// to hide them from parser.
-
+/*
+ * [noparse][i]italic[/i][/noparse] turns into
+ * [noparse][ i ]italic[ /i ][/noparse],
+ * to hide them from parser.
+ */
function bb_spacefy($st) {
- $whole_match = $st[0];
- $captured = $st[1];
- $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured);
- $new_str = str_replace($captured, $spacefied, $whole_match);
- return $new_str;
+ $whole_match = $st[0];
+ $captured = $st[1];
+ $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured);
+ $new_str = str_replace($captured, $spacefied, $whole_match);
+ return $new_str;
}
-// The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
-// now turns back and the [noparse] tags are trimed
-// returning [i]italic[/i]
-
+/*
+ * The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
+ * now turns back and the [noparse] tags are trimed
+ * returning [i]italic[/i]
+ */
function bb_unspacefy_and_trim($st) {
- $whole_match = $st[0];
- $captured = $st[1];
- $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured);
- return $unspacefied;
+ $whole_match = $st[0];
+ $captured = $st[1];
+ $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured);
+ return $unspacefied;
}
-function bb_find_open_close($s, $open, $close, $occurance = 1) {
-
- if($occurance < 1)
- $occurance = 1;
+function bb_find_open_close($s, $open, $close, $occurence = 1) {
+ if ($occurence < 1) {
+ $occurence = 1;
+ }
$start_pos = -1;
- for($i = 1; $i <= $occurance; $i++) {
- if( $start_pos !== false)
+ for ($i = 1; $i <= $occurence; $i++) {
+ if ($start_pos !== false) {
$start_pos = strpos($s, $open, $start_pos + 1);
+ }
}
- if( $start_pos === false)
+ if ($start_pos === false) {
return false;
+ }
$end_pos = strpos($s, $close, $start_pos);
- if( $end_pos === false)
+ if ($end_pos === false) {
return false;
+ }
$res = array( 'start' => $start_pos, 'end' => $end_pos );
return $res;
}
-function get_bb_tag_pos($s, $name, $occurance = 1) {
-
- if($occurance < 1)
- $occurance = 1;
+function get_bb_tag_pos($s, $name, $occurence = 1) {
+ if ($occurence < 1) {
+ $occurence = 1;
+ }
$start_open = -1;
- for($i = 1; $i <= $occurance; $i++) {
- if( $start_open !== false)
+ for ($i = 1; $i <= $occurence; $i++) {
+ if ($start_open !== false) {
$start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags
+ }
}
- if( $start_open === false)
+ if ($start_open === false) {
return false;
+ }
$start_equal = strpos($s, '=', $start_open);
$start_close = strpos($s, ']', $start_open);
- if( $start_close === false)
+ if ($start_close === false) {
return false;
+ }
$start_close++;
$end_open = strpos($s, '[/' . $name . ']', $start_close);
- if( $end_open === false)
+ if ($end_open === false) {
return false;
+ }
- $res = array( 'start' => array('open' => $start_open, 'close' => $start_close),
- 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
- if( $start_equal !== false)
+ $res = array(
+ 'start' => array(
+ 'open' => $start_open,
+ 'close' => $start_close
+ ),
+ 'end' => array(
+ 'open' => $end_open,
+ 'close' => $end_open + strlen('[/' . $name . ']')
+ ),
+ );
+
+ if ($start_equal !== false) {
$res['start']['equal'] = $start_equal + 1;
+ }
return $res;
}
@@ -273,27 +304,27 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
$string = $s;
- $occurance = 1;
- $pos = get_bb_tag_pos($string, $name, $occurance);
- while($pos !== false && $occurance < 1000) {
-
+ $occurence = 1;
+ $pos = get_bb_tag_pos($string, $name, $occurence);
+ while ($pos !== false && $occurence < 1000) {
$start = substr($string, 0, $pos['start']['open']);
$subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
$end = substr($string, $pos['end']['close']);
- if($end === false)
+ if ($end === false) {
$end = '';
+ }
$subject = preg_replace($pattern, $replace, $subject);
$string = $start . $subject . $end;
- $occurance++;
- $pos = get_bb_tag_pos($string, $name, $occurance);
+ $occurence++;
+ $pos = get_bb_tag_pos($string, $name, $occurence);
}
return $string;
}
-if(! function_exists('bb_extract_images')) {
+if (! function_exists('bb_extract_images')) {
function bb_extract_images($body) {
$saved_image = array();
@@ -304,26 +335,28 @@ function bb_extract_images($body) {
$img_start = strpos($orig_body, '[img');
$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
- while(($img_st_close !== false) && ($img_end !== false)) {
+ while (($img_st_close !== false) && ($img_end !== false)) {
$img_st_close++; // make it point to AFTER the closing bracket
$img_end += $img_start;
- if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+ if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
// This is an embedded image
$saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
$new_body = $new_body . substr($orig_body, 0, $img_start) . '[$#saved_image' . $cnt . '#$]';
$cnt++;
- }
- else
+ } else {
$new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
+ }
$orig_body = substr($orig_body, $img_end + strlen('[/img]'));
- if($orig_body === false) // in case the body ends on a closing image tag
+ if ($orig_body === false) {
+ // in case the body ends on a closing image tag
$orig_body = '';
+ }
$img_start = strpos($orig_body, '[img');
$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
@@ -335,13 +368,13 @@ function bb_extract_images($body) {
return array('body' => $new_body, 'images' => $saved_image);
}}
-if(! function_exists('bb_replace_images')) {
+if (! function_exists('bb_replace_images')) {
function bb_replace_images($body, $images) {
$newbody = $body;
$cnt = 0;
- foreach($images as $image) {
+ foreach ($images as $image) {
// We're depending on the property of 'foreach' (specified on the PHP website) that
// it loops over the array starting from the first element and going sequentially
// to the last element
@@ -510,85 +543,94 @@ function bb_ShareAttributes($share, $simplehtml) {
);
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) {
+ /// @TODO Some hosts run on https, not just http and sometimes http is disabled, let's support both here
$UserData = fetch_url("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 . ")");
+ }
}
}
}
@@ -598,28 +640,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=".App::get_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);
@@ -660,20 +701,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] == "") 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]");
+ }
}
function bb_CleanPictureLinksSub($match) {
$text = Cache::get($match[1]);
- if(is_null($text)){
+ if (is_null($text)) {
$a = get_app();
$stamp1 = microtime(true);
@@ -715,34 +758,58 @@ 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;
}
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]));
+ 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];
}
- // 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) {
+/**
+ * @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();
// 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);
@@ -772,19 +839,20 @@ 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) {
+ if (strpos($Text, '[code=') !== false) {
$Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text);
}
// Convert new line chars to html $1
',$Text); + $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
';
// 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'; @@ -1007,8 +1081,9 @@ 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) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) { + $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text); + } // Check for [spoiler=Author] text @@ -1016,10 +1091,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) + while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism", "
$2", $Text); + } // Declare the format for [quote] layout $QuoteLayout = '
$1'; @@ -1027,8 +1103,9 @@ 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) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) { + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text); + } // Check for [quote=Author] text @@ -1036,10 +1113,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) + while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", "
$2", $Text); + } // [img=widthxheight]image source[/img] @@ -1057,14 +1135,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // 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",'
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);
- // sanitizes src attributes (only relative URIs or http URLs)
- $Text = preg_replace('#<([^>]*?)(src)="(?!/|http)(.*?)"(.*?)>#ism', '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text);
+ // sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails)
+ static $allowed_src_protocols = array('http', 'redir', 'cid');
+ $Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
+ '<$1$2=""$4 class="invalid-src" title="' . 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', array('ftp', 'mailto', 'gopher', 'cid'));
+
+ // Always allowed protocol even if config isn't set or not including it
+ $allowed_link_protocols[] = 'http';
- // sanitize href attributes (only relative URIs or whitelisted protocols URLs)
- $allowed_link_protocols = get_config('system', 'allowed_link_protocols');
- $regex = '#<([^>]*?)(href)="(?!/|http|' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
+ $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
$Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text);
- if($saved_image) {
+ if ($saved_image) {
$Text = bb_replace_images($Text, $saved_image);
}
@@ -1191,19 +1287,19 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$Text = $doc->saveHTML();
$Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $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('