X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbbcode.php;h=6cce25bcf4ab1a92df350176a682d02b3cad0e1f;hb=d034822f079d063cffb607109bf1e0c03a9276e0;hp=81536d37200fdd5083a38685c306282856f8d0cb;hpb=e55f9f8f07c42d1accf28ce31a100a671f2738c9;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 81536d3720..6cce25bcf4 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,6 +3,8 @@ require_once("include/oembed.php");
require_once('include/event.php');
require_once('include/map.php');
require_once('mod/proxy.php');
+require_once('include/Contact.php');
+require_once('include/plaintext.php');
function bb_PictureCacheExt($matches) {
if (strpos($matches[3], "data:image/") === 0)
@@ -30,228 +32,100 @@ function bb_map_location($match) {
}
function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
- $Text = preg_replace_callback("/(.*?)\[attachment(.*?)\](.*?)\[\/attachment\]/ism",
- function ($match) use ($simplehtml, $tryoembed){
- $attributes = $match[2];
+ $data = get_attachment_data($Text);
- $type = "";
- preg_match("/type='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $type = strtolower($matches[1]);
+ if (!$data)
+ return $Text;
- preg_match('/type="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $type = strtolower($matches[1]);
-
- if ($type == "")
- return($match[0]);
-
- if (!in_array($type, array("link", "audio", "video")))
- return($match[0]);
-
- $url = "";
- preg_match("/url='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $url = $matches[1];
-
- preg_match('/url="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $url = $matches[1];
-
- $title = "";
- preg_match("/title='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $title = $matches[1];
-
- preg_match('/title="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $title = $matches[1];
-
- //$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
- $title = bbcode(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, false, true);
- $title = str_replace(array("[", "]"), array("[", "]"), $title);
-
- $image = "";
- if ($type != "video") {
- preg_match("/image='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $image = $matches[1];
-
- preg_match('/image="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $image = $matches[1];
- }
-
- $preview = "";
- if ($type != "video") {
- preg_match("/preview='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $preview = $matches[1];
-
- preg_match('/preview="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $preview = $matches[1];
- }
-
- if (((strpos($match[1], "[img=") !== false) OR (strpos($match[1], "[img]") !== false)) AND ($image != "")) {
- $preview = $image;
- $image = "";
- }
-
- if ($simplehtml == 7)
- $text = sprintf('%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($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]."";
@@ -292,24 +166,25 @@ function bb_onelinecode_cb($match) {
}
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;
}
@@ -534,8 +409,23 @@ function bb_ShareAttributes($share, $simplehtml) {
$reldate = (($posted) ? " " . relative_date($posted) : '');
}
- $userid = GetProfileUsername($profile,$author, false);
- $userid_compact = GetProfileUsername($profile,$author, true);
+ $data = get_contact_details_by_url($profile);
+
+ if (isset($data["name"]) AND isset($data["addr"]))
+ $userid_compact = $data["name"]." (".$data["addr"].")";
+ else
+ $userid_compact = GetProfileUsername($profile,$author, true);
+
+ if (isset($data["addr"]))
+ $userid = $data["addr"];
+ else
+ $userid = GetProfileUsername($profile,$author, false);
+
+ if (isset($data["name"]))
+ $author = $data["name"];
+
+ if (isset($data["photo"]))
+ $avatar = $data["photo"];
$preshare = trim($share[1]);
@@ -599,13 +489,16 @@ function bb_ShareAttributes($share, $simplehtml) {
$text .= "
".$link;
break;
default:
- $headline = trim($share[1]).'