X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplaintext.php;h=53015c961f3487230858dbeaac8df2711675902d;hb=c105a67cd9cb0669c492cb20d1153fac1c001b56;hp=d98d736550469225f226b6fbc7341065b9b43fef;hpb=d489ba1510a2dcfaa7851d937d3c37a9541544c9;p=friendica.git diff --git a/include/plaintext.php b/include/plaintext.php index d98d736550..53015c961f 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -4,7 +4,8 @@ * @file include/plaintext.php */ -use \Friendica\ParseUrl; +use Friendica\App; +use Friendica\ParseUrl; require_once("include/Photo.php"); require_once("include/bbcode.php"); @@ -53,7 +54,7 @@ function get_old_attachment_data($body) { $picturedata = get_photo_info($matches[1]); - if (($picturedata[0] >= 500) AND ($picturedata[0] >= $picturedata[1])) + if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) $post["image"] = $matches[1]; else $post["preview"] = $matches[1]; @@ -63,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)) @@ -70,7 +75,6 @@ function get_old_attachment_data($body) { } } - return $post; } @@ -175,7 +179,7 @@ function get_attachment_data($body) { return($data); } -function get_attached_data($body) { +function get_attached_data($body, $item = array()) { /* - text: - type: link, video, photo @@ -186,20 +190,25 @@ function get_attached_data($body) { - (thumbnail) */ + $has_title = !empty($item['title']); + $plink = (!empty($item['plink']) ? $item['plink'] : ''); $post = get_attachment_data($body); // if nothing is found, it maybe having an image. if (!isset($post["type"])) { + // Simplify image codes + $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body); + $URLSearchString = "^\[\]"; if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) { - if (count($pictures) == 1) { + if ((count($pictures) == 1) && !$has_title) { // Checking, if the link goes to a picture $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") AND strstr($pictures[0][1], "/photos/")) + if (($data["type"] != "photo") && strstr($pictures[0][1], "/photos/")) $data = ParseUrl::getSiteinfo($pictures[0][1], true); if ($data["type"] == "photo") { @@ -221,44 +230,67 @@ function get_attached_data($body) { $post["text"] = str_replace($pictures[0][0], "", $body); } } - } elseif (count($pictures) > 1) { + } elseif (count($pictures) > 0) { $post["type"] = "link"; - $post["url"] = $b["plink"]; + $post["url"] = $plink; $post["image"] = $pictures[0][2]; $post["text"] = $body; } } elseif (preg_match_all("(\[img\]([$URLSearchString]*)\[\/img\])ism", $body, $pictures, PREG_SET_ORDER)) { - if (count($pictures) == 1) { + if ((count($pictures) == 1) && !$has_title) { $post["type"] = "photo"; $post["image"] = $pictures[0][1]; $post["text"] = str_replace($pictures[0][0], "", $body); - } elseif (count($pictures) > 1) { + } elseif (count($pictures) > 0) { $post["type"] = "link"; - $post["url"] = $b["plink"]; + $post["url"] = $plink; $post["image"] = $pictures[0][1]; $post["text"] = $body; } } - if (preg_match_all("(\[url\]([$URLSearchString]*)\[\/url\])ism", $body, $links, PREG_SET_ORDER)) { - if (count($links) == 1) { - $post["type"] = "text"; - $post["url"] = $links[0][1]; - $post["text"] = $body; - } + // Test for the external links + preg_match_all("(\[url\]([$URLSearchString]*)\[\/url\])ism", $body, $links1, PREG_SET_ORDER); + preg_match_all("(\[url\=([$URLSearchString]*)\].*?\[\/url\])ism", $body, $links2, PREG_SET_ORDER); + + $links = array_merge($links1, $links2); + + // If there is only a single one, then use it. + // This should cover link posts via API. + if ((count($links) == 1) && !isset($post["preview"]) && !$has_title) { + $post["type"] = "link"; + $post["text"] = trim($body); + $post["url"] = $links[0][1]; + } + + // Now count the number of external media links + preg_match_all("(\[vimeo\](.*?)\[\/vimeo\])ism", $body, $links1, PREG_SET_ORDER); + preg_match_all("(\[youtube\\](.*?)\[\/youtube\\])ism", $body, $links2, PREG_SET_ORDER); + preg_match_all("(\[video\\](.*?)\[\/video\\])ism", $body, $links3, PREG_SET_ORDER); + preg_match_all("(\[audio\\](.*?)\[\/audio\\])ism", $body, $links4, PREG_SET_ORDER); + + // Add them to the other external links + $links = array_merge($links, $links1, $links2, $links3, $links4); + + // Are there more than one? + if (count($links) > 1) { + // The post will be the type "text", which means a blog post + unset($post["type"]); + $post["url"] = $plink; } + if (!isset($post["type"])) { $post["type"] = "text"; $post["text"] = trim($body); } - } elseif (isset($post["url"]) AND ($post["type"] == "video")) { + } elseif (isset($post["url"]) && ($post["type"] == "video")) { $data = ParseUrl::getSiteinfoCached($post["url"], true); if (isset($data["images"][0])) $post["image"] = $data["images"][0]["src"]; } - return($post); + return $post; } function shortenmsg($msg, $limit, $twitter = false) { @@ -268,12 +300,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; } @@ -292,7 +325,7 @@ function shortenmsg($msg, $limit, $twitter = false) { * * @return string The converted message */ -function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") { +function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") { // Remove the hash tags $URLSearchString = "^\[\]"; @@ -307,9 +340,9 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t // At first look at data that is attached via "type-..." stuff // This will hopefully replaced with a dedicated bbcode later //$post = get_attached_data($b["body"]); - $post = get_attached_data($body); + $post = get_attached_data($body, $b); - 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"]); @@ -323,7 +356,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 @@ -367,25 +400,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 = ""; @@ -408,16 +441,17 @@ 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"])) { + } elseif (!isset($post["url"])) { $limit = $limit - 23; $post["url"] = $b["plink"]; - } elseif (strpos($b["body"], "[share") !== false) - $post["url"] = $b["plink"]; - elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening")) + // Which purpose has this line? It is now uncommented, but left as a reminder + //} elseif (strpos($b["body"], "[share") !== false) { + // $post["url"] = $b["plink"]; + } elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening")) { $post["url"] = $b["plink"]; - + } $msg = shortenmsg($msg, $limit); } } @@ -426,4 +460,3 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t return($post); } -?>