X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplaintext.php;h=1d16aa2e8d4c781c5595d76406b3ede8ce1cab7d;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=39eed5111e12abca8523b7e6370b60c9a9a16d07;hpb=af37fa8293ea72e0f8b229f7fdad392b5e2fb912;p=friendica.git diff --git a/include/plaintext.php b/include/plaintext.php index 39eed5111e..1d16aa2e8d 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -1,6 +1,16 @@ = 500) AND ($picturedata[0] >= $picturedata[1])) + if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) $post["image"] = $matches[1]; else $post["preview"] = $matches[1]; @@ -54,6 +64,10 @@ function get_old_attachment_data($body) { $post["url"] = $matches[1]; $post["title"] = $matches[2]; } + if (($post["url"] == "") && (in_array($post["type"], array("link", "video"))) + && preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) { + $post["url"] = $matches[1]; + } // Search for description if (preg_match("/\[quote\](.*?)\[\/quote\]/ism", $attacheddata, $matches)) @@ -82,7 +96,7 @@ function get_attachment_data($body) { $data = array(); - if (!preg_match("/(.*)\[attachment(.*)\](.*?)\[\/attachment\](.*)/ism", $body, $match)) + if (!preg_match("/(.*)\[attachment(.*?)\](.*?)\[\/attachment\](.*)/ism", $body, $match)) return get_old_attachment_data($body); $attributes = $match[2]; @@ -117,7 +131,7 @@ function get_attachment_data($body) { $url = $matches[1]; if ($url != "") - $data["url"] = $url; + $data["url"] = html_entity_decode($url, ENT_QUOTES, 'UTF-8'); $title = ""; preg_match("/title='(.*?)'/ism", $attributes, $matches); @@ -128,12 +142,12 @@ function get_attachment_data($body) { 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); - - if ($title != "") + if ($title != "") { + $title = bbcode(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, false, true); + $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); + $title = str_replace(array("[", "]"), array("[", "]"), $title); $data["title"] = $title; + } $image = ""; preg_match("/image='(.*?)'/ism", $attributes, $matches); @@ -145,7 +159,7 @@ function get_attachment_data($body) { $image = $matches[1]; if ($image != "") - $data["image"] = $image; + $data["image"] = html_entity_decode($image, ENT_QUOTES, 'UTF-8'); $preview = ""; preg_match("/preview='(.*?)'/ism", $attributes, $matches); @@ -157,7 +171,7 @@ function get_attachment_data($body) { $preview = $matches[1]; if ($preview != "") - $data["preview"] = $preview; + $data["preview"] = html_entity_decode($preview, ENT_QUOTES, 'UTF-8'); $data["description"] = trim($match[3]); @@ -181,14 +195,18 @@ function get_attached_data($body) { // if nothing is found, it maybe having an image. if (!isset($post["type"])) { - require_once("mod/parse_url.php"); - require_once("include/Photo.php"); - $URLSearchString = "^\[\]"; if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) { if (count($pictures) == 1) { // Checking, if the link goes to a picture - $data = parseurl_getsiteinfo_cached($pictures[0][1], true); + $data = ParseUrl::getSiteinfoCached($pictures[0][1], true); + + // Workaround: + // Sometimes photo posts to the own album are not detected at the start. + // So we seem to cannot use the cache for these cases. That's strange. + if (($data["type"] != "photo") && strstr($pictures[0][1], "/photos/")) + $data = ParseUrl::getSiteinfo($pictures[0][1], true); + if ($data["type"] == "photo") { $post["type"] = "photo"; if (isset($data["images"][0])) { @@ -238,9 +256,8 @@ function get_attached_data($body) { $post["type"] = "text"; $post["text"] = trim($body); } - } elseif (isset($post["url"]) AND ($post["type"] == "video")) { - require_once("mod/parse_url.php"); - $data = parseurl_getsiteinfo_cached($post["url"], true); + } elseif (isset($post["url"]) && ($post["type"] == "video")) { + $data = ParseUrl::getSiteinfoCached($post["url"], true); if (isset($data["images"][0])) $post["image"] = $data["images"][0]["src"]; @@ -256,12 +273,13 @@ function shortenmsg($msg, $limit, $twitter = false) { $lines = explode("\n", $msg); $msg = ""; $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + $ellipsis = html_entity_decode("…", ENT_QUOTES, 'UTF-8'); foreach ($lines AS $row=>$line) { if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit) $msg = trim($msg."\n".$line); // Is the new message empty by now or is it a reshared message? - elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle))) - $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8")."..."; + elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle))) + $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis; else break; } @@ -280,10 +298,7 @@ function shortenmsg($msg, $limit, $twitter = false) { * * @return string The converted message */ -function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") { - require_once("include/bbcode.php"); - require_once("include/html2plain.php"); - require_once("include/network.php"); +function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") { // Remove the hash tags $URLSearchString = "^\[\]"; @@ -300,7 +315,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t //$post = get_attached_data($b["body"]); $post = get_attached_data($body); - if (($b["title"] != "") AND ($post["text"] != "")) + if (($b["title"] != "") && ($post["text"] != "")) $post["text"] = trim($b["title"]."\n\n".$post["text"]); elseif ($b["title"] != "") $post["text"] = trim($b["title"]); @@ -314,7 +329,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t // If we post to a network with no limit we only fetch // an abstract exactly for this network - if (($limit == 0) AND ($abstract == $default_abstract)) + if (($limit == 0) && ($abstract == $default_abstract)) $abstract = ""; } else // Try to guess the correct target network @@ -343,7 +358,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t } } - $html = bbcode($post["text"], false, false, $htmlmode); + $html = bbcode($post["text"].$post["after"], false, false, $htmlmode); $msg = html2plain($html, 0, true); $msg = trim(html_entity_decode($msg,ENT_QUOTES,'UTF-8')); @@ -358,25 +373,25 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t elseif ($post["type"] == "photo") $link = $post["image"]; - if (($msg == "") AND isset($post["title"])) + if (($msg == "") && isset($post["title"])) $msg = trim($post["title"]); - if (($msg == "") AND isset($post["description"])) + if (($msg == "") && isset($post["description"])) $msg = trim($post["description"]); // If the link is already contained in the post, then it neeedn't to be added again // But: if the link is beyond the limit, then it has to be added. - if (($link != "") AND strstr($msg, $link)) { + if (($link != "") && strstr($msg, $link)) { $pos = strpos($msg, $link); // Will the text be shortened in the link? // Or is the link the last item in the post? - if (($limit > 0) AND ($pos < $limit) AND (($pos + 23 > $limit) OR ($pos + strlen($link) == strlen($msg)))) + if (($limit > 0) && ($pos < $limit) && (($pos + 23 > $limit) || ($pos + strlen($link) == strlen($msg)))) $msg = trim(str_replace($link, "", $msg)); - elseif (($limit == 0) OR ($pos < $limit)) { + elseif (($limit == 0) || ($pos < $limit)) { // The limit has to be increased since it will be shortened - but not now // Only do it with Twitter (htmlmode = 8) - if (($limit > 0) AND (strlen($link) > 23) AND ($htmlmode == 8)) + if (($limit > 0) && (strlen($link) > 23) && ($htmlmode == 8)) $limit = $limit - 23 + strlen($link); $link = ""; @@ -399,7 +414,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t if (iconv_strlen($msg, "UTF-8") > $limit) { - if (($post["type"] == "text") AND isset($post["url"])) + if (($post["type"] == "text") && isset($post["url"])) $post["url"] = $b["plink"]; elseif (!isset($post["url"])) { $limit = $limit - 23; @@ -417,4 +432,3 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t return($post); } -?>