X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=c05173f47c559782cf8f1ad401f415112a82e1bf;hb=e6463c8af6af247c9555bf2677a6aa75a4721d62;hp=32265363cc156aafde1d778688f0b79a854b41d5;hpb=f34135f34dc4262dbb9978ea27d45f10e595078f;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 32265363cc..c05173f47c 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,8 +1,28 @@
%s',
- $url, $title, $title);
- elseif (($simplehtml != 4) AND ($simplehtml != 0))
- $text = sprintf('%s
', $url, $title);
- else {
- $text = sprintf('', $type);
-
- $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $url, $title), $url, $title);
- if ($tryoembed)
- $oembed = tryoembed($bookmark);
- else
- $oembed = $bookmark[0];
-
- if (strstr(strtolower($oembed), "', trim($match[3]));
- }
- }
-
- return($match[1].$text);
- },$Text);
-
- return($Text);
-}
-
-function bb_rearrange_share($shared) {
- if (!in_array(strtolower($shared[2]), array("type-link", "type-audio", "type-video")))
- return($shared[0]);
-
- if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
- return($shared[0]);
-
- $type = substr(trim(strtolower($shared[2])), 5);
-
- $title = "";
- $url = "";
- $preview = "";
- $description = "";
-
- if (isset($bookmark[2][0]))
- $title = $bookmark[2][0];
-
- if (isset($bookmark[1][0]))
- $url = $bookmark[1][0];
+ if (isset($data["title"])) {
+ $data["title"] = strip_tags($data["title"]);
+ $data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
+ }
- $cleanedshare = trim($shared[3]);
- $cleanedshare = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $cleanedshare);
- preg_match("/\[img\](.*?)\[\/img\]/ism", $cleanedshare, $matches);
+ if (((strpos($data["text"], "[img=") !== false) OR (strpos($data["text"], "[img]") !== false)) AND ($data["image"] != "")) {
+ $data["preview"] = $data["image"];
+ $data["image"] = "";
+ }
- if ($matches)
- $preview = trim($matches[1]);
+ if ($simplehtml == 7) {
+ $title2 = $data["title"];
- preg_match("/\[quote\](.*?)\[\/quote\]/ism", $cleanedshare, $matches);
- if ($matches)
- $description = trim($matches[1]);
+ $test1 = trim(html_entity_decode($data["text"],ENT_QUOTES,'UTF-8'));
+ $test2 = trim(html_entity_decode($data["title"],ENT_QUOTES,'UTF-8'));
- $url = str_replace(array("[", "]"), array("[", "]"), htmlentities($url, ENT_QUOTES, 'UTF-8', false));
- $title = str_replace(array("[", "]"), array("[", "]"), htmlentities($title, ENT_QUOTES, 'UTF-8', false));
- $preview = str_replace(array("[", "]"), array("[", "]"), htmlentities($preview, ENT_QUOTES, 'UTF-8', false));
+ // 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"]);
- $Text = trim($shared[1])."\n[attachment type='".$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 ($url != "")
- $Text .= " url='".$url."'";
- if ($title != "")
- $Text .= " title='".$title."'";
- if ($preview != "") {
- require_once("include/Photo.php");
- $picturedata = get_photo_info($preview);
+ if (strstr(strtolower($oembed), "', trim(bbcode($data["description"])));
+ }
+ }
+ return $data["text"].$text.$data["after"];
}
function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
- $Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism",
- function ($match) use ($plaintext, $nolink){
- return(bb_cleanup_share($match, $plaintext, $nolink));
- },$Text);
- return($Text);
-}
-
-function bb_cleanup_share($shared, $plaintext, $nolink) {
- $shared[1] = trim($shared[1]);
- if (!in_array($shared[2], array("type-link", "type-video")))
- return($shared[0]);
+ $data = get_attachment_data($Text);
- if ($plaintext)
- $shared[3] = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism","[bookmark=$1]$1[/bookmark]", $shared[3]);
-
- if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
- return($shared[0]);
+ if (!$data)
+ return $Text;
if ($nolink)
- return($shared[1]);
-
- $title = "";
- $link = "";
-
- if (isset($bookmark[2][0]))
- $title = $bookmark[2][0];
-
- if (isset($bookmark[1][0]))
- $link = $bookmark[1][0];
-
- if (($shared[1] != "") AND (strpos($title, $shared[1]) !== false))
- $shared[1] = $title;
-
- if (($title != "") AND ((strpos($shared[1],$title) !== false) OR
- (similar_text($shared[1],$title) / strlen($title)) > 0.9))
- $title = "";
-
-// if (strpos($shared[1],$link) !== false)
-// $link = "";
-
- $text = trim($shared[1]);
+ 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)))
+ $data["title"] = $data["url"];
+ elseif (($text != "") AND strstr($title, $text)) {
+ $data["text"] = $data["title"];
+ $data["title"] = $data["url"];
+ }
- if (($text == "") AND ($title != "") AND ($link == ""))
- $text .= "\n\n".trim($title);
+ if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == ""))
+ return $data["title"].$data["after"];
// If the link already is included in the post, don't add it again
- if (($link != "") AND strpos($text, $link))
- return(trim($text));
+ if (($data["url"] != "") AND strpos($data["text"], $data["url"]))
+ return $data["text"].$data["after"];
- if (($link != "") AND ($title != ""))
- $text .= "\n[url=".trim($link)."]".trim($title)."[/url]";
- elseif (($link != ""))
- $text .= "\n".trim($link);
+ $text = $data["text"];
- return(trim($text));
-}
+ if (($data["url"] != "") AND ($data["title"] != ""))
+ $text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]";
+ elseif (($data["url"] != ""))
+ $text .= "\n".$data["url"];
+ return $text."\n".$data["after"];
+}
function bb_cleanstyle($st) {
return "".$st[2]."";
@@ -257,7 +148,7 @@ function cleancss($input) {
if (($char >= "a") and ($char <= "z"))
$cleaned .= $char;
- if (!(strpos(" #;:0123456789-_", $char) === false))
+ if (!(strpos(" #;:0123456789-_.%", $char) === false))
$cleaned .= $char;
}
@@ -268,25 +159,33 @@ 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]."
";
+}
+
function tryoembed($match){
- //$url = ((count($match)==2)?$match[1]:$match[2]);
$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);
- //logger("tryoembed: $url");
$o = oembed_fetch_url($url);
+ if (!is_object($o))
+ return $match[0];
+
if (isset($match[2]))
$o->title = $match[2];
if ($o->type=="error") return $match[0];
$html = oembed_format_object($o);
- return $html; //oembed_iframe($html,$o->width,$o->height);
+ return $html;
}
@@ -448,7 +347,7 @@ 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++;
}
@@ -498,21 +397,40 @@ function bb_ShareAttributes($share, $simplehtml) {
$itemcache = get_itemcachepath();
- // relative dates only make sense when they aren't cached
- if ($itemcache == "") {
- preg_match("/posted='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $posted = $matches[1];
+ preg_match("/posted='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $posted = $matches[1];
- preg_match('/posted="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $posted = $matches[1];
+ preg_match('/posted="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $posted = $matches[1];
+ // relative dates only make sense when they aren't cached
+ if ($itemcache == "")
$reldate = (($posted) ? " " . relative_date($posted) : '');
- }
- $userid = GetProfileUsername($profile,$author, false);
- $userid_compact = GetProfileUsername($profile,$author, true);
+ // 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);
+
+ $data = get_contact_details_by_url($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 (isset($data["addr"]) AND ($data["addr"] != ""))
+ $userid = $data["addr"];
+ else
+ $userid = GetProfileUsername($profile,$author, false);
+
+ if (isset($data["name"]) AND ($data["name"] != ""))
+ $author = $data["name"];
+
+ if (isset($data["micro"]) AND ($data["micro"] != ""))
+ $avatar = $data["micro"];
$preshare = trim($share[1]);
@@ -576,13 +494,22 @@ function bb_ShareAttributes($share, $simplehtml) {
$text .= "
".$link;
break;
default:
- $headline = trim($share[1]).'
'.trim($share[3]).""; + $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]) + ) + ); break; } return($text); @@ -686,9 +613,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork = } 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) { @@ -798,6 +723,13 @@ function bb_CleanPictureLinks($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])); + return $match[0]; +} + // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica - Mike Macgirvin @@ -812,6 +744,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $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); // Move all spaces out of the tags $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text); @@ -844,13 +778,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = preg_replace("/\n\[code\]/ism", "[code]", $Text); $Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text); - // Rearrange shares to attachments - $Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism", "bb_rearrange_share",$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); + // 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
$1
',$Text); + // Check for bold text $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'$1',$Text); @@ -1091,13 +1041,17 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal "$2", $Text); + // [img=widthxheight]image source[/img] - //$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '
with
+ $Text = preg_replace_callback("|(?!
]*>)([^<]*)
(?!
]*>)|ism", 'bb_onelinecode_cb', $Text);
+
// Unhide all [noparse] contained bbtags unspacefying them
// and triming the [noparse] tag.
@@ -1202,11 +1161,24 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$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|cid)(.*?)\>/ism",'<$1$2="">',$Text);
+ $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text);
+
+ // sanitizes src attributes (only relative redir URIs or http URLs)
+ $Text = preg_replace('#<([^>]*?)(src)="(?!http|redir)(.*?)"(.*?)>#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';
- if($saved_image)
+ $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) {
$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.
@@ -1240,4 +1212,43 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
return trim($Text);
}
+
+/**
+ * @brief Removes the "abstract" element from the text
+ *
+ * @param string $text The text with BBCode
+ * @return string The same text - but without "abstract" element
+ */
+function remove_abstract($text) {
+ $text = preg_replace("/[\s|\n]*\[abstract\].*?\[\/abstract\][\s|\n]*/ism", '', $text);
+ $text = preg_replace("/[\s|\n]*\[abstract=.*?\].*?\[\/abstract][\s|\n]*/ism", '', $text);
+
+ return $text;
+}
+
+/**
+ * @brief Returns the value of the "abstract" element
+ *
+ * @param string $text The text that maybe contains the element
+ * @param string $addon The addon for which the abstract is meant for
+ * @return string The abstract
+ */
+function fetch_abstract($text, $addon = "") {
+ $abstract = "";
+ $abstracts = array();
+ $addon = strtolower($addon);
+
+ if (preg_match_all("/\[abstract=(.*?)\](.*?)\[\/abstract\]/ism",$text, $results, PREG_SET_ORDER))
+ foreach ($results AS $result)
+ $abstracts[strtolower($result[1])] = $result[2];
+
+ if (isset($abstracts[$addon]))
+ $abstract = $abstracts[$addon];
+
+ if ($abstract == "")
+ if (preg_match("/\[abstract\](.*?)\[\/abstract\]/ism",$text, $result))
+ $abstract = $result[1];
+
+ return $abstract;
+}
?>