Remove unused `use` statements & remove PConfig class

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

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 189cc579ba0c87732579b27c5ff8c4fc405cd4ea..6dac33bfb14e4a5656ebda787ddbb91f1c66a3ab 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Network\Probe;
@@ -216,7 +217,7 @@ class GContact
 
                if (empty($gcontact['server_url'])) {
                        // We check the server url to be sure that it is a real one
-                       $server_url = Contact::getBasepath($gcontact['url']);
+                       $server_url = self::getBasepath($gcontact['url']);
 
                        // We are now sure that it is a correct URL. So we use it in the future
                        if ($server_url != '') {
@@ -508,7 +509,7 @@ class GContact
                $done[] = DI::baseUrl() . '/poco';
 
                if (strlen(Config::get('system', 'directory'))) {
-                       $x = Network::fetchUrl(get_server() . '/pubsites');
+                       $x = Network::fetchUrl(Search::getGlobalDirectory() . '/pubsites');
                        if (!empty($x)) {
                                $j = json_decode($x);
                                if (!empty($j->entries)) {
@@ -1128,6 +1129,38 @@ class GContact
                self::update($gcontact);
        }
 
+       /**
+        * @brief Get the basepath for a given contact link
+        *
+        * @param string $url The gcontact link
+        * @param boolean $dont_update Don't update the contact
+        *
+        * @return string basepath
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function getBasepath($url, $dont_update = false)
+       {
+               $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($url)]);
+               if (!empty($gcontact['server_url'])) {
+                       return $gcontact['server_url'];
+               } elseif ($dont_update) {
+                       return '';
+               }
+
+               self::updateFromProbe($url, true);
+
+               // Fetch the result
+               $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($url)]);
+               if (empty($gcontact['server_url'])) {
+                       Logger::info('No baseurl for gcontact', ['url' => $url]);
+                       return '';
+               }
+
+               Logger::info('Found baseurl for gcontact', ['url' => $url, 'baseurl' => $gcontact['server_url']]);
+               return $gcontact['server_url'];
+       }
+
        /**
         * @brief Fetches users of given GNU Social server
         *