X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FParseUrl.php;h=4611cf8efe5f25378caa699044543af6269bab4c;hb=fe442683efb8b75394d7df041716c47c81b05fbc;hp=a0ff0f1773a9d74f1799a688e53e09d33d3e611d;hpb=59b4f2e99395f1c4944df7379f4e530322e7330f;p=friendica.git

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index a0ff0f1773..4611cf8efe 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -214,7 +214,7 @@ class ParseUrl
 		];
 
 		if ($count > 10) {
-			Logger::notice('Endless loop detected', ['url' => $url]);
+			Logger::warning('Endless loop detected', ['url' => $url]);
 			return $siteinfo;
 		}
 
@@ -287,22 +287,22 @@ class ParseUrl
 		// Expected form: Content-Type: text/html; charset=ISO-8859-4
 		if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $curlResult->getContentType(), $matches)) {
 			$charset = trim(trim(trim(array_pop($matches)), ';,'));
+		} else {
+			// Then in body that gets precedence
+			// Expected forms:
+			// - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+			// - <meta charset="utf-8">
+			// - <meta charset=utf-8>
+			// - <meta charSet="utf-8">
+			// We escape <style> and <script> tags since they can contain irrelevant charset information
+			// (see https://github.com/friendica/friendica/issues/9251#issuecomment-698636806)
+			Strings::performWithEscapedBlocks($body, '#<(?:style|script).*?</(?:style|script)>#ism', function ($body) use (&$charset) {
+				if (preg_match('/charset=["\']?([a-z0-9-_.\/]+)/i', $body, $matches)) {
+					$charset = trim(trim(trim(array_pop($matches)), ';,'));
+				}
+			});
 		}
 
-		// Then in body that gets precedence
-		// Expected forms:
-		// - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		// - <meta charset="utf-8">
-		// - <meta charset=utf-8>
-		// - <meta charSet="utf-8">
-		// We escape <style> and <script> tags since they can contain irrelevant charset information
-		// (see https://github.com/friendica/friendica/issues/9251#issuecomment-698636806)
-		Strings::performWithEscapedBlocks($body, '#<(?:style|script).*?</(?:style|script)>#ism', function ($body) use (&$charset) {
-			if (preg_match('/charset=["\']?([a-z0-9-_.\/]+)/i', $body, $matches)) {
-				$charset = trim(trim(trim(array_pop($matches)), ';,'));
-			}
-		});
-
 		$siteinfo['charset'] = $charset;
 
 		if ($charset && strtoupper($charset) != 'UTF-8') {
@@ -1040,17 +1040,17 @@ class ParseUrl
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'description');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['text'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'image');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['image'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['image'] = trim($content);
 		}
 
@@ -1075,22 +1075,22 @@ class ParseUrl
 		$jsonldinfo = [];
 
 		$content = JsonLD::fetchElement($jsonld, 'name');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_name'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'description');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_description'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'url');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_url'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['image'] = trim($content);
 		}
 
@@ -1114,32 +1114,32 @@ class ParseUrl
 		$jsonldinfo = [];
 
 		$content = JsonLD::fetchElement($jsonld, 'name');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_name'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'description');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_description'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'url');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_url'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'logo', 'url', '@type', 'ImageObject');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_img'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'brand', 'name', '@type', 'Organization');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_name'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'brand', 'url', '@type', 'Organization');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['publisher_url'] = trim($content);
 		}
 
@@ -1161,12 +1161,12 @@ class ParseUrl
 		$jsonldinfo = [];
 
 		$content = JsonLD::fetchElement($jsonld, 'name');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['author_name'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'description');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['author_description'] = trim($content);
 		}
 
@@ -1176,7 +1176,7 @@ class ParseUrl
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'url');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$jsonldinfo['author_url'] = trim($content);
 		}
 
@@ -1207,22 +1207,22 @@ class ParseUrl
 		$media = [];
 
 		$content = JsonLD::fetchElement($jsonld, 'caption');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['caption'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'url');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['url'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'mainEntityOfPage');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['main'] = Strings::compareLink($content, $siteinfo['url']);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'description');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['description'] = trim($content);
 		}
 
@@ -1232,27 +1232,27 @@ class ParseUrl
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'contentUrl');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['content'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'embedUrl');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['embed'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'height');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['height'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'width');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['width'] = trim($content);
 		}
 
 		$content = JsonLD::fetchElement($jsonld, 'image');
-		if (!empty($content)) {
+		if (!empty($content) && is_string($content)) {
 			$media['image'] = trim($content);
 		}