X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=20631818a2503fbe8167130edd644e1cccd6a41b;hb=28d79281a9d521591d197215aaf9a7c92ed265e1;hp=489ef8b2e38e0b7680a701538dad49533305663e;hpb=b6a4a2ec7fcf7d9f28b0b0fdd9bc2ad2cdba2b3c;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 489ef8b2e3..20631818a2 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,139 +1,169 @@
' . generate_map(str_replace('/',' ',$match[1])) . '', $match[0]);
+ return str_replace($match[0], '
' . Map::byCoordinates(str_replace('/', ' ', $match[1])) . '
', $match[0]);
}
function bb_map_location($match) {
// the extra space in the following line is intentional
- return str_replace($match[0],'' . generate_named_map($match[1]) . '
', $match[0]);
+ return str_replace($match[0], '' . Map::byLocation($match[1]) . '
', $match[0]);
}
-function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
-
- $data = get_attachment_data($Text);
- if (!$data)
- return $Text;
+/**
+ * Processes [attachment] tags
+ *
+ * Note: Can produce a [bookmark] tag in the returned string
+ *
+ * @brief Processes [attachment] tags
+ * @param string $return
+ * @param bool|int $simplehtml
+ * @param bool $tryoembed
+ * @return string
+ */
+function bb_attachment($return, $simplehtml = false, $tryoembed = true)
+{
+ $data = BBCode::getAttachmentData($return);
+ if (!$data) {
+ return $return;
+ }
if (isset($data["title"])) {
$data["title"] = strip_tags($data["title"]);
- $data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
+ $data["title"] = str_replace(["http://", "https://"], "", $data["title"]);
}
- if (((strpos($data["text"], "[img=") !== false) OR (strpos($data["text"], "[img]") !== false)) AND ($data["image"] != "")) {
+ if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false) || Config::get('system', 'always_show_preview')) && ($data["image"] != "")) {
$data["preview"] = $data["image"];
$data["image"] = "";
}
+ $return = '';
if ($simplehtml == 7) {
- $title2 = $data["title"];
-
- $test1 = trim(html_entity_decode($data["text"],ENT_QUOTES,'UTF-8'));
- $test2 = trim(html_entity_decode($data["title"],ENT_QUOTES,'UTF-8'));
-
- // If the link description is similar to the text above then don't add the link description
- if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR
- (similar_text($test1,$test2) / strlen($data["title"])) > 0.9))
- $title2 = $data["url"];
- $text = sprintf('%s
',
- $data["url"], $data["title"], $title2);
- } elseif (($simplehtml != 4) AND ($simplehtml != 0))
- $text = sprintf('%s
', $data["url"], $data["title"]);
- else {
- $text = sprintf('', $data["type"]);
-
- $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
- if ($tryoembed)
- $oembed = tryoembed($bookmark);
- else
- $oembed = $bookmark[0];
-
- if (strstr(strtolower($oembed), "', trim(bbcode($data["description"])));
+ $return = style_url_for_mastodon($data["url"]);
+ } elseif (($simplehtml != 4) && ($simplehtml != 0)) {
+ $return = sprintf('%s
', $data["url"], $data["title"]);
+ } else {
+ try {
+ if ($tryoembed && OEmbed::isAllowedURL($data['url'])) {
+ $return = OEmbed::getHTML($data['url'], $data['title']);
+ } else {
+ throw new Exception('OEmbed is disabled for this attachment.');
+ }
+ } catch (Exception $e) {
+ if ($simplehtml != 4) {
+ $return = sprintf('', $data["type"]);
+ }
+
+ if ($data["image"] != "") {
+ $return .= sprintf('
', $data["url"], proxy_url($data["image"]), $data["title"]);
+ } elseif ($data["preview"] != "") {
+ $return .= sprintf('
', $data["url"], proxy_url($data["preview"]), $data["title"]);
+ }
+
+ if (($data["type"] == "photo") && ($data["url"] != "") && ($data["image"] != "")) {
+ $return .= sprintf('
', $data["url"], proxy_url($data["image"]), $data["title"]);
+ } else {
+ $return .= sprintf('
', $data['url'], $data['title']);
+ }
+
+ if ($data["description"] != "" && $data["description"] != $data["title"]) {
+ $return .= sprintf('
%s
', trim(bbcode($data["description"])));
+ }
+
+ if ($data["type"] == "link") {
+ $return .= sprintf('
%s', $data['url'], parse_url($data['url'], PHP_URL_HOST));
+ }
+
+ if ($simplehtml != 4) {
+ $return .= '
';
+ }
}
}
- return $data["text"].$text.$data["after"];
+
+ return trim($data["text"] . ' ' . $return . ' ' . $data["after"]);
}
function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
- $data = get_attachment_data($Text);
+ $data = BBCode::getAttachmentData($Text);
- if (!$data)
+ if (!$data) {
return $Text;
-
- if ($nolink)
- return $data["text"].$data["after"];
+ } elseif ($nolink) {
+ return $data["text"] . $data["after"];
+ }
$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
- if ($plaintext OR (($title != "") AND strstr($text, $title)))
+ if ($plaintext || (($title != "") && strstr($text, $title))) {
$data["title"] = $data["url"];
- elseif (($text != "") AND strstr($title, $text)) {
+ } elseif (($text != "") && strstr($title, $text)) {
$data["text"] = $data["title"];
$data["title"] = $data["url"];
}
- if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == ""))
- return $data["title"].$data["after"];
+ if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) {
+ return $data["title"] . $data["after"];
+ }
// If the link already is included in the post, don't add it again
- if (($data["url"] != "") AND strpos($data["text"], $data["url"]))
- return $data["text"].$data["after"];
+ if (($data["url"] != "") && strpos($data["text"], $data["url"])) {
+ return $data["text"] . $data["after"];
+ }
$text = $data["text"];
- if (($data["url"] != "") AND ($data["title"] != ""))
- $text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]";
- elseif (($data["url"] != ""))
- $text .= "\n".$data["url"];
+ if (($data["url"] != "") && ($data["title"] != "")) {
+ $text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
+ } elseif (($data["url"] != "")) {
+ $text .= "\n" . $data["url"];
+ }
- return $text."\n".$data["after"];
+ return $text . "\n" . $data["after"];
}
function bb_cleanstyle($st) {
- return "".$st[2]."";
+ return "" . $st[2] . "";
}
function bb_cleanclass($st) {
- return "".$st[2]."";
+ return "" . $st[2] . "";
}
function cleancss($input) {
@@ -145,128 +175,166 @@ function cleancss($input) {
for ($i = 0; $i < strlen($input); $i++) {
$char = substr($input, $i, 1);
- if (($char >= "a") and ($char <= "z"))
+ if (($char >= "a") && ($char <= "z")) {
$cleaned .= $char;
+ }
- if (!(strpos(" #;:0123456789-_.%", $char) === false))
+ if (!(strpos(" #;:0123456789-_.%", $char) === false)) {
$cleaned .= $char;
+ }
}
- return($cleaned);
+ return $cleaned;
}
-function stripcode_br_cb($s) {
- return '[code]' . str_replace('
', '', $s[1]) . '[/code]';
-}
-
-function bb_onelinecode_cb($match) {
- if (strpos($match[1],"
")===false){
- return "".$match[1]."";
- }
- return "".$match[1]."
";
-}
-
-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);
+/**
+ * @brief Converts [url] BBCodes in a format that looks fine on Mastodon. (callback function)
+ * @param array $match Array with the matching values
+ * @return string reformatted link including HTML codes
+ */
+function bb_style_url($match) {
+ $url = $match[1];
- if (!is_object($o))
+ if (isset($match[2]) && ($match[1] != $match[2])) {
return $match[0];
+ }
- if (isset($match[2]))
- $o->title = $match[2];
-
- if ($o->type=="error") return $match[0];
+ $parts = parse_url($url);
+ if (!isset($parts['scheme'])) {
+ return $match[0];
+ }
- $html = oembed_format_object($o);
- return $html;
+ return style_url_for_mastodon($url);
+}
+/**
+ * @brief Converts [url] BBCodes in a format that looks fine on Mastodon and GNU Social.
+ * @param string $url URL that is about to be reformatted
+ * @return string reformatted link including HTML codes
+ */
+function style_url_for_mastodon($url) {
+ $styled_url = $url;
+
+ $parts = parse_url($url);
+ $scheme = $parts['scheme'].'://';
+ $styled_url = str_replace($scheme, '', $styled_url);
+
+ $html = ''.
+ '%s';
+
+ if (strlen($styled_url) > 30) {
+ $html .= '%s'.
+ '%s';
+
+ $ellipsis = substr($styled_url, 0, 30);
+ $rest = substr($styled_url, 30);
+ return sprintf($html, $url, $scheme, $ellipsis, $rest);
+ } else {
+ $html .= '%s';
+ return sprintf($html, $url, $scheme, $styled_url);
+ }
}
-// [noparse][i]italic[/i][/noparse] turns into
-// [noparse][ i ]italic[ /i ][/noparse],
-// to hide them from parser.
+function stripcode_br_cb($s) {
+ return '[code]' . str_replace('
', '', $s[1]) . '[/code]';
+}
+/*
+ * [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;
+ $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 );
+ $res = [ '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 = [
+ 'start' => [
+ 'open' => $start_open,
+ 'close' => $start_close
+ ],
+ 'end' => [
+ 'open' => $end_open,
+ 'close' => $end_open + strlen('[/' . $name . ']')
+ ],
+ ];
+
+ if ($start_equal !== false) {
$res['start']['equal'] = $start_equal + 1;
+ }
return $res;
}
@@ -275,30 +343,29 @@ 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')) {
function bb_extract_images($body) {
- $saved_image = array();
+ $saved_image = [];
$orig_body = $body;
$new_body = '';
@@ -306,26 +373,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);
@@ -334,10 +403,9 @@ function bb_extract_images($body) {
$new_body = $new_body . $orig_body;
- return array('body' => $new_body, 'images' => $saved_image);
-}}
+ return ['body' => $new_body, 'images' => $saved_image];
+}
-if(! function_exists('bb_replace_images')) {
function bb_replace_images($body, $images) {
$newbody = $body;
@@ -347,250 +415,290 @@ function bb_replace_images($body, $images) {
// 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
- $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '', $newbody);
+ $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '', $newbody);
$cnt++;
}
return $newbody;
-}}
+}
-function bb_ShareAttributes($share, $simplehtml) {
+/**
+ * Processes [share] tags
+ *
+ * Note: Can produce a [bookmark] tag in the output
+ *
+ * @brief Processes [share] tags
+ * @param array $share preg_match_callback result array
+ * @param bool|int $simplehtml
+ * @return string
+ */
+function bb_ShareAttributes($share, $simplehtml)
+{
$attributes = $share[2];
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+ if (x($matches, 1)) {
+ $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8');
+ }
preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$author = $matches[1];
+ }
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$profile = $matches[1];
+ }
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$profile = $matches[1];
+ }
$avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$avatar = $matches[1];
+ }
preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$avatar = $matches[1];
+ }
$link = "";
preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$link = $matches[1];
+ }
preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$link = $matches[1];
+ }
$posted = "";
- $itemcache = get_itemcachepath();
-
preg_match("/posted='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$posted = $matches[1];
+ }
preg_match('/posted="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if (x($matches, 1)) {
$posted = $matches[1];
-
- // relative dates only make sense when they aren't cached
- if ($itemcache == "")
- $reldate = (($posted) ? " " . relative_date($posted) : '');
+ }
// We only call this so that a previously unknown contact can be added.
// This is important for the function "get_contact_details_by_url".
// This function then can fetch an entry from the contact table.
- get_contact($profile, 0);
+ Contact::getIdForURL($profile, 0);
- $data = get_contact_details_by_url($profile);
+ $data = Contact::getDetailsByURL($profile);
- if (isset($data["name"]) AND ($data["name"] != "") AND isset($data["addr"]) AND ($data["addr"] != ""))
- $userid_compact = $data["name"]." (".$data["addr"].")";
- else
- $userid_compact = GetProfileUsername($profile,$author, true);
+ if (x($data, "name") && x($data, "addr")) {
+ $userid_compact = $data["name"] . " (" . $data["addr"] . ")";
+ } else {
+ $userid_compact = GetProfileUsername($profile, $author, true);
+ }
- if (isset($data["addr"]) AND ($data["addr"] != ""))
+ if (x($data, "addr")) {
$userid = $data["addr"];
- else
- $userid = GetProfileUsername($profile,$author, false);
+ } else {
+ $userid = GetProfileUsername($profile, $author, false);
+ }
- if (isset($data["name"]) AND ($data["name"] != ""))
+ if (x($data, "name")) {
$author = $data["name"];
+ }
- if (isset($data["micro"]) AND ($data["micro"] != ""))
+ if (x($data, "micro")) {
$avatar = $data["micro"];
+ }
$preshare = trim($share[1]);
-
- if ($preshare != "")
- $preshare .= "
";
+ if ($preshare != "") {
+ $preshare .= "
";
+ }
switch ($simplehtml) {
case 1:
- $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid.":
»".$share[3]."«";
+ $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid . ":
»" . $share[3] . "«";
break;
case 2:
- $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3];
+ $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ":
" . $share[3];
break;
case 3: // Diaspora
- $headline .= ''.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').$userid.':
';
+ $headline .= '' . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . $userid . ':
';
$text = trim($share[1]);
- if ($text != "")
+ if ($text != "") {
$text .= "
";
+ }
- if (substr(normalise_link($link), 0, 19) != "http://twitter.com/") {
- $text .= $headline.''.trim($share[3])."
";
+ if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
+ $text .= $headline . '' . trim($share[3]) . "
";
- if ($link != "")
- $text .= '
[l]';
- } else
- $text .= '
'.$link.'';
+ if ($link != "") {
+ $text .= '
[l]';
+ }
+ } else {
+ $text .= '
' . $link . '';
+ }
break;
case 4:
- $headline = '";
+ $headline .= '
' . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
+ $headline .= L10n::t('%2$s %3$s', $link, $userid, $posted);
+ $headline .= ":
";
$text = trim($share[1]);
- if ($text != "")
+ if ($text != "") {
$text .= "
";
+ }
- $text .= $headline.''.trim($share[3])."
";
+ $text .= $headline . '' . trim($share[3]) . "
";
break;
case 5:
- $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3];
+ $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ":
" . $share[3];
break;
case 6: // app.net
- $text = $preshare.">> @".$userid_compact.":
".$share[3];
+ $text = $preshare . ">> @" . $userid_compact . ":
" . $share[3];
break;
case 7: // statusnet/GNU Social
- $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
+ $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . " @" . $userid_compact . ": " . $share[3];
break;
case 8: // twitter
- $text = $preshare."RT @".$userid_compact.": ".$share[3];
+ $text = $preshare . "RT @" . $userid_compact . ": " . $share[3];
break;
case 9: // Google+/Facebook
- $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3];
+ $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ":
" . $share[3];
- if ($link != "")
- $text .= "
".$link;
+ if ($link != "") {
+ $text .= "
" . $link;
+ }
break;
default:
- $text = trim($share[1])."\n";
-
- $avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
-
- $tpl = get_markup_template('shared_content.tpl');
- $text .= replace_macros($tpl,
- array(
- '$profile' => $profile,
- '$avatar' => $avatar,
- '$author' => $author,
- '$link' => $link,
- '$posted' => $posted,
- '$reldate' => $reldate,
- '$content' => trim($share[3])
- )
- );
+ // 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 . ")");
+ }
}
}
}
@@ -600,26 +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) {
- return "[url=".App::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);
@@ -639,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)
@@ -660,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);
@@ -694,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)
@@ -715,34 +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;
}
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
+/**
+ * @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();
-function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) {
+ /*
+ * 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];
+ }
- $a = get_app();
+ 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);
@@ -772,19 +924,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
tags
@@ -795,48 +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",
+ } 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);
@@ -844,42 +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);
- }
-// }
-
- if ($tryoembed)
- $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$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);
+ '$1$3', $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);
@@ -892,7 +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:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2',$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);
@@ -901,61 +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);
+ $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;
@@ -964,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
';
@@ -1007,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
';
@@ -1027,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]
@@ -1052,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", '', $Text);
- $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '', $Text);
+ $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '', $Text);
+ $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '', $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",'
', $Text);
- $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'
', $Text);
- //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'
', $Text);
+ function ($match) use ($simplehtml) {
+ return bb_ShareAttributes($match, $simplehtml);
+ }, $Text);
+ $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
', $Text);
+ $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
', $Text);
+ //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
', $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);
@@ -1083,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);
@@ -1132,60 +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\-id\](.*?)\[\/event\-id\]/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);
// 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');
+ static $allowed_src_protocols = ['http', 'redir', 'cid'];
$Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
- '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text);
+ '<$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', array('ftp', 'mailto', 'gopher', 'cid'));
+ $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 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text);
+ $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) {
+ 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;
@@ -1196,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('