X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=3309a74b9f0d22041a9e529924e96f3c94f28343;hb=3488b937ead0b3988d1f22c632bc2cc81393249b;hp=4fabba6c7e7c001e65b06cf783e9c05c0cd30641;hpb=066b776dcce54d39b56ad1075bef150d4125467b;p=friendica.git

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 4fabba6c7e..3309a74b9f 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -11,6 +11,8 @@
 */
 
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
 require_once("include/items.php");
@@ -22,21 +24,21 @@ function parse_url_content(App $a) {
 
 	$br = "\n";
 
-	if (x($_GET,"binurl")) {
+	if (!empty($_GET["binurl"])) {
 		$url = trim(hex2bin($_GET["binurl"]));
 	} else {
 		$url = trim($_GET["url"]);
 	}
 
-	if ($_GET["title"]) {
+	if (!empty($_GET["title"])) {
 		$title = strip_tags(trim($_GET["title"]));
 	}
 
-	if ($_GET["description"]) {
+	if (!empty($_GET["description"])) {
 		$text = strip_tags(trim($_GET["description"]));
 	}
 
-	if ($_GET["tags"]) {
+	if (!empty($_GET["tags"])) {
 		$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
 		if (count($arr_tags)) {
 			$str_tags = $br . implode(" ", $arr_tags) . $br;
@@ -59,14 +61,17 @@ function parse_url_content(App $a) {
 	// the URL with the corresponding BBCode media tag
 	$redirects = 0;
 	// Fetch the header of the URL
-	$result = z_fetch_url($url, false, $redirects, array("novalidate" => true, "nobody" => true));
+	$result = Network::curl($url, false, $redirects, ["novalidate" => true, "nobody" => true]);
 	if($result["success"]) {
 		// Convert the header fields into an array
-		$hdrs = array();
+		$hdrs = [];
 		$h = explode("\n", $result["header"]);
 		foreach ($h as $l) {
-			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-			$hdrs[$k] = $v;
+			$header = array_map("trim", explode(":", trim($l), 2));
+			if (count($header) == 2) {
+				list($k,$v) = $header;
+				$hdrs[$k] = $v;
+			}
 		}
 		if (array_key_exists("Content-Type", $hdrs)) {
 			$type = $hdrs["Content-Type"];
@@ -89,20 +94,20 @@ function parse_url_content(App $a) {
 
 	$template = "[bookmark=%s]%s[/bookmark]%s";
 
-	$arr = array("url" => $url, "text" => "");
+	$arr = ["url" => $url, "text" => ""];
 
-	call_hooks("parse_link", $arr);
+	Addon::callHooks("parse_link", $arr);
 
 	if (strlen($arr["text"])) {
 		echo $arr["text"];
 		killme();
 	}
 
-	// If there is allready some content information submitted we don't
+	// If there is already some content information submitted we don't
 	// need to parse the url for content.
-	if ($url && $title && $text) {
+	if (!empty($url) && !empty($title) && !empty($text)) {
 
-		$title = str_replace(array("\r","\n"),array("",""),$title);
+		$title = str_replace(["\r","\n"],["",""],$title);
 
 		$text = "[quote]" . trim($text) . "[/quote]" . $br;