X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplaintext.php;h=a5031e7d81ce2ae0f7ede3e947af1f3effad4677;hb=104a03e82a1cc4c72de65f27cc5b7953a24bf069;hp=221d1471b1a7576fd8199e42108027037abf43d1;hpb=0373056448aec398ee765065adc998aa0da02ac0;p=friendica.git

diff --git a/include/plaintext.php b/include/plaintext.php
index 221d1471b1..a5031e7d81 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -3,9 +3,9 @@
  * @file include/plaintext.php
  */
 use Friendica\App;
-use Friendica\ParseUrl;
 use Friendica\Core\PConfig;
-use Friendica\Object\Photo;
+use Friendica\Object\Image;
+use Friendica\Util\ParseUrl;
 
 require_once "include/bbcode.php";
 require_once "include/html2plain.php";
@@ -26,14 +26,14 @@ require_once "include/network.php";
  */
 function get_old_attachment_data($body) {
 
-	$post = array();
+	$post = [];
 
 	// Simplify image codes
 	$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
 
 	if (preg_match_all("(\[class=(.*?)\](.*?)\[\/class\])ism",$body, $attached,  PREG_SET_ORDER)) {
 		foreach ($attached AS $data) {
-			if (!in_array($data[1], array("type-link", "type-video", "type-photo")))
+			if (!in_array($data[1], ["type-link", "type-video", "type-photo"]))
 				continue;
 
 			$post["type"] = substr($data[1], 5);
@@ -51,7 +51,7 @@ function get_old_attachment_data($body) {
 
 			if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
 
-				$picturedata = Photo::getInfoFromURL($matches[1]);
+				$picturedata = Image::getInfoFromURL($matches[1]);
 
 				if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1]))
 					$post["image"] = $matches[1];
@@ -63,7 +63,7 @@ function get_old_attachment_data($body) {
 				$post["url"] = $matches[1];
 				$post["title"] = $matches[2];
 			}
-			if (($post["url"] == "") && (in_array($post["type"], array("link", "video")))
+			if (($post["url"] == "") && (in_array($post["type"], ["link", "video"]))
 				&& preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
 				$post["url"] = $matches[1];
 			}
@@ -90,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];
 
@@ -103,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, $item = array()) {
+function get_attached_data($body, $item = []) {
 /*
  - text:
  - type: link, video, photo
@@ -221,7 +238,7 @@ function get_attached_data($body, $item = array()) {
 					$post["preview"] = $pictures[0][2];
 					$post["text"] = str_replace($pictures[0][0], "", $body);
 				} else {
-					$imgdata = Photo::getInfoFromURL($pictures[0][1]);
+					$imgdata = Image::getInfoFromURL($pictures[0][1]);
 					if (substr($imgdata["mime"], 0, 6) == "image/") {
 						$post["type"] = "photo";
 						$post["image"] = $pictures[0][1];
@@ -292,30 +309,38 @@ function get_attached_data($body, $item = array()) {
 	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');
 	$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 == "") || (($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
+	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?
@@ -324,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 = "^\[\]";