X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplaintext.php;h=6ab4ec77d6c9120adcd6213e65b40d2b02d13246;hb=dbbe6efd27cde052402e1d9995f77feb95d1c265;hp=92ba8a27564bc9f0b182f6f96a92239528b3314f;hpb=8ec424325375aa923c7d2d78ac8ddcc352f09cff;p=friendica.git

diff --git a/include/plaintext.php b/include/plaintext.php
index 92ba8a2756..6ab4ec77d6 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -1,6 +1,15 @@
 <?php
 
+/**
+ * @file include/plaintext.php
+ */
+
+use \Friendica\ParseUrl;
+
 require_once("include/Photo.php");
+require_once("include/bbcode.php");
+require_once("include/html2plain.php");
+require_once("include/network.php");
 
 /**
  * @brief Fetches attachment data that were generated the old way
@@ -54,6 +63,10 @@ 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)) {
+				$post["url"] = $matches[1];
+			}
 
 			// Search for description
 			if (preg_match("/\[quote\](.*?)\[\/quote\]/ism", $attacheddata, $matches))
@@ -82,7 +95,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];
@@ -116,10 +129,8 @@ function get_attachment_data($body) {
 	if ($matches[1] != "")
 		$url = $matches[1];
 
-	$url = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
-
 	if ($url != "")
-		$data["url"] = $url;
+		$data["url"] = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
 
 	$title = "";
 	preg_match("/title='(.*?)'/ism", $attributes, $matches);
@@ -130,11 +141,12 @@ function get_attachment_data($body) {
 	if ($matches[1] != "")
 		$title = $matches[1];
 
-	$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("&#91;", "&#93;"), $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("&#91;", "&#93;"), $title);
 		$data["title"] = $title;
+	}
 
 	$image = "";
 	preg_match("/image='(.*?)'/ism", $attributes, $matches);
@@ -146,7 +158,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);
@@ -158,7 +170,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]);
 
@@ -182,14 +194,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") AND strstr($pictures[0][1], "/photos/"))
+					$data = ParseUrl::getSiteinfo($pictures[0][1], true);
+
 				if ($data["type"] == "photo") {
 					$post["type"] = "photo";
 					if (isset($data["images"][0])) {
@@ -240,8 +256,7 @@ function get_attached_data($body) {
 			$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);
+		$data = ParseUrl::getSiteinfoCached($post["url"], true);
 
 		if (isset($data["images"][0]))
 			$post["image"] = $data["images"][0]["src"];
@@ -257,12 +272,13 @@ function shortenmsg($msg, $limit, $twitter = false) {
 	$lines = explode("\n", $msg);
 	$msg = "";
 	$recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
+	$ellipsis = html_entity_decode("&#x2026;", 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")."...";
+			$msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis;
 		else
 			break;
 	}
@@ -281,10 +297,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 = "^\[\]";