Merge pull request #5620 from annando/fix-remove

[friendica.git] / mod / parse_url.php

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 6fb404f1b052f9714d9afb9ff2f62c87872570b0..3309a74b9f0d22041a9e529924e96f3c94f28343 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -12,6 +12,7 @@
 
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
 require_once("include/items.php");
@@ -23,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;
@@ -60,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, ["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 = [];
                $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"];
@@ -99,9 +103,9 @@ function parse_url_content(App $a) {
                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(["\r","\n"],["",""],$title);