Merge pull request #8754 from MrPetovan/task/8676-ap-attachments

[friendica.git] / src / Model / GServer.php

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 08663fa0650f824b8f20f2f8edf49fd0ed698510..133ad14b3a861f76273bdf80c36be410e32ca3a7 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -247,6 +247,12 @@ class GServer
                Logger::info('Set failed status for new server', ['url' => $url]);
        }
 
+       /**
+        * Remove unwanted content from the given URL
+        *
+        * @param string $url
+        * @return string cleaned URL
+        */
        public static function cleanURL(string $url)
        {
                $url = trim($url, '/');
@@ -260,13 +266,15 @@ class GServer
                return Network::unparseURL($urlparts);
        }
 
+       /**
+        * Return the base URL
+        *
+        * @param string $url
+        * @return string base URL
+        */
        private static function getBaseURL(string $url)
        {
-               $urlparts = parse_url($url);
-               unset($urlparts['user']);
-               unset($urlparts['pass']);
-               unset($urlparts['query']);
-               unset($urlparts['fragment']);
+               $urlparts = parse_url(self::cleanURL($url));
                unset($urlparts['path']);
                return Network::unparseURL($urlparts);
        }
@@ -461,7 +469,7 @@ class GServer
                        }
                }
 
-               if (!empty($id) && ($serverdata['network'] != Protocol::PHANTOM)) {
+               if (!empty($serverdata['network']) && !empty($id) && ($serverdata['network'] != Protocol::PHANTOM)) {
                        $gcontacts = DBA::count('gcontact', ['gsid' => $id]);
                        $apcontacts = DBA::count('apcontact', ['gsid' => $id]);
                        $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id]);