X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplaintext.php;h=a5031e7d81ce2ae0f7ede3e947af1f3effad4677;hb=c4d3ab68785122ff070c65a444aaa0833b746b2b;hp=632abf30cb79f612b3002a1104fc32d16905d395;hpb=e67133ef5653448003ceac29147cda41a4c9e017;p=friendica.git diff --git a/include/plaintext.php b/include/plaintext.php index 632abf30cb..a5031e7d81 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -1,15 +1,15 @@ = 500) AND ($picturedata[0] >= $picturedata[1])) + if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) $post["image"] = $matches[1]; else $post["preview"] = $matches[1]; @@ -63,8 +63,8 @@ function get_old_attachment_data($body) { $post["url"] = $matches[1]; $post["title"] = $matches[2]; } - if (($post["url"] == "") AND (in_array($post["type"], array("link", "video"))) - AND preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) { + if (($post["url"] == "") && (in_array($post["type"], ["link", "video"])) + && preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) { $post["url"] = $matches[1]; } @@ -74,7 +74,6 @@ function get_old_attachment_data($body) { } } - return $post; } @@ -91,12 +90,13 @@ function get_old_attachment_data($body) { * 'title' -> Title of the attachment * 'description' -> Description of the attachment */ -function get_attachment_data($body) { +function get_attachment_data($body) +{ + $data = []; - $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]; @@ -104,82 +104,98 @@ function get_attachment_data($body) { $type = ""; preg_match("/type='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $type = strtolower($matches[1]); + } preg_match('/type="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $type = strtolower($matches[1]); + } - if ($type == "") - return(array()); + if ($type == "") { + return []; + } - if (!in_array($type, array("link", "audio", "photo", "video"))) - return(array()); + if (!in_array($type, ["link", "audio", "photo", "video"])) { + return []; + } - if ($type != "") + if ($type != "") { $data["type"] = $type; + } $url = ""; preg_match("/url='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $url = $matches[1]; + } preg_match('/url="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $url = $matches[1]; + } - if ($url != "") + if ($url != "") { $data["url"] = html_entity_decode($url, ENT_QUOTES, 'UTF-8'); + } $title = ""; preg_match("/title='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $title = $matches[1]; + } preg_match('/title="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $title = $matches[1]; + } 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); + $title = str_replace(["[", "]"], ["[", "]"], $title); $data["title"] = $title; } $image = ""; preg_match("/image='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $image = $matches[1]; + } preg_match('/image="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $image = $matches[1]; + } - if ($image != "") + if ($image != "") { $data["image"] = html_entity_decode($image, ENT_QUOTES, 'UTF-8'); + } $preview = ""; preg_match("/preview='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $preview = $matches[1]; + } preg_match('/preview="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $preview = $matches[1]; + } - if ($preview != "") + if ($preview != "") { $data["preview"] = html_entity_decode($preview, ENT_QUOTES, 'UTF-8'); + } $data["description"] = trim($match[3]); $data["after"] = trim($match[4]); - return($data); + return $data; } -function get_attached_data($body) { +function get_attached_data($body, $item = []) { /* - text: - type: link, video, photo @@ -190,20 +206,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") { @@ -217,7 +238,7 @@ function get_attached_data($body) { $post["preview"] = $pictures[0][2]; $post["text"] = str_replace($pictures[0][0], "", $body); } else { - $imgdata = get_photo_info($pictures[0][1]); + $imgdata = Image::getInfoFromURL($pictures[0][1]); if (substr($imgdata["mime"], 0, 6) == "image/") { $post["type"] = "photo"; $post["image"] = $pictures[0][1]; @@ -225,69 +246,101 @@ 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) { - /// @TODO - /// For Twitter URLs aren't shortened, but they have to be calculated as if. - +/** + * Shortens message + * + * @param type $msg + * @param type $limit + * @return type + * + * @todo For Twitter URLs aren't shortened, but they have to be calculated as if. + */ +function shortenmsg($msg, $limit) +{ $lines = explode("\n", $msg); $msg = ""; $recycle = 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")."..."; - else + $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); + } elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle))) { + // Is the new message empty by now or is it a reshared message? + $msg = iconv_substr(iconv_substr(trim($msg . "\n" . $line), 0, $limit, "UTF-8"), 0, -3, "UTF-8") . $ellipsis; + } else { break; + } } - return($msg); + + return $msg; } /** * @brief Convert a message into plaintext for connectors to other networks * - * @param App $a The application class * @param array $b The message array that is about to be posted * @param int $limit The maximum number of characters when posting to that network * @param bool $includedlinks Has an attached link to be included into the message? @@ -296,7 +349,7 @@ function shortenmsg($msg, $limit, $twitter = false) { * * @return string The converted message */ -function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") { +function plaintext($b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") { // Remove the hash tags $URLSearchString = "^\[\]"; @@ -311,9 +364,9 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 // 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"]); @@ -327,7 +380,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 // 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 @@ -371,25 +424,25 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 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 = ""; @@ -412,16 +465,17 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 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 (PConfig::get($b["uid"], "system", "no_intelligent_shortening")) { $post["url"] = $b["plink"]; - + } $msg = shortenmsg($msg, $limit); } } @@ -430,4 +484,3 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 return($post); } -?>