Merge pull request #8222 from annando/ap-gnusocial

[friendica.git] / src / Core / Search.php

diff --git a/src/Core/Search.php b/src/Core/Search.php
index c10b5f6d6ac02ef2521f4af5f3e19a77c7803e76..01c12fa92179ae6bad4f9e90100b20f4e704b6fd 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -245,7 +245,6 @@ class Search
        /**
         * Searching for global contacts for autocompletion
         *
-        * @brief Searching for global contacts for autocompletion
         * @param string $search Name or part of a name or nick
         * @param string $mode   Search mode (e.g. "community")
         * @param int    $page   Page number (starts at 1)
@@ -254,7 +253,7 @@ class Search
         */
        public static function searchGlobalContact($search, $mode, int $page = 1)
        {
-               if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                        return [];
                }
 
@@ -268,11 +267,11 @@ class Search
                }
 
                // check if searching in the local global contact table is enabled
-               if (Config::get('system', 'poco_local_search')) {
+               if (DI::config()->get('system', 'poco_local_search')) {
                        $return = GContact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = Network::curl(get_server() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
+                       $curlResult = Network::curl(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {
@@ -283,4 +282,14 @@ class Search
 
                return $return ?? [];
        }
+
+       /**
+        * Returns the global directory name, used in this node
+        *
+        * @return string
+        */
+       public static function getGlobalDirectory()
+       {
+               return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
+       }
 }