Merge pull request #5386 from annando/dfrn-unknown-owner

[friendica.git] / src / Util / Network.php

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 393b993e35d26c29a30497d7036c3e4587b52270..0e65145b78340caca37bc49f583a9d62c441df0e 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -18,12 +18,13 @@ use DomXPath;
 class Network
 {
        /**
-        * @brief Curl wrapper
+        * Curl wrapper
         *
         * If binary flag is true, return binary results.
         * Set the cookiejar argument to a string (e.g. "/tmp/friendica-cookies.txt")
         * to preserve cookies from one request to the next.
         *
+        * @brief Curl wrapper
         * @param string  $url            URL to fetch
         * @param boolean $binary         default false
         *                                TRUE if asked to return binary results (file download)
@@ -42,11 +43,12 @@ class Network
        }
 
        /**
-        * @brief Curl wrapper with array of return values.
+        * Curl wrapper with array of return values.
         *
         * Inner workings and parameters are the same as @ref fetchUrl but returns an array with
         * all the information collected during the fetch.
         *
+        * @brief Curl wrapper with array of return values.
         * @param string  $url            URL to fetch
         * @param boolean $binary         default false
         *                                TRUE if asked to return binary results (file download)
@@ -101,7 +103,7 @@ class Network
                $a = get_app();
 
                $parts = parse_url($url);
-               $path_parts = explode('/', $parts['path']);
+               $path_parts = explode('/', defaults($parts, 'path', ''));
                foreach ($path_parts as $part) {
                        if (strlen($part) <> mb_strlen($part)) {
                                $parts2[] = rawurlencode($part);
@@ -250,7 +252,7 @@ class Network
 
                        $newurl = $curl_info['redirect_url'];
 
-                       if (($new_location_info['path'] == '') && ($new_location_info['host'] != '')) {
+                       if (empty($new_location_info['path']) && !empty($new_location_info['host'])) {
                                $newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
                        }
 
@@ -890,8 +892,8 @@ class Network
                $i = 0;
                $path = "";
                do {
-                       $path1 = $pathparts1[$i];
-                       $path2 = $pathparts2[$i];
+                       $path1 = defaults($pathparts1, $i, '');
+                       $path2 = defaults($pathparts2, $i, '');
 
                        if ($path1 == $path2) {
                                $path .= $path1."/";