Merge pull request #8710 from annando/fix-vid

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

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 7c00e6224c2a473688b62819e9ee0d87ff34fe00..32090733c4d692e4d9e07156bcb069ca5ecf5827 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Core;
 
@@ -123,7 +142,7 @@ class Search
                $profiles = $results['profiles'] ?? [];
 
                foreach ($profiles as $profile) {
-                       $profile_url = $profile['profile_url'] ?? '';
+                       $profile_url = $profile['url'] ?? '';
                        $contactDetails = Contact::getDetailsByURL($profile_url, local_user());
 
                        $result = new ContactResult(
@@ -253,7 +272,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 [];
                }
 
@@ -267,7 +286,7 @@ 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 : '';
@@ -290,6 +309,21 @@ class Search
         */
        public static function getGlobalDirectory()
        {
-               return Config::get('system', 'directory', self::DEFAULT_DIRECTORY);
+               return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
+       }
+
+       /**
+        * Return the search path (either fulltext search or tag search)
+        *
+        * @param string $search
+        * @return string search path
+        */
+       public static function getSearchPath(string $search)
+       {
+               if (substr($search, 0, 1) == '#') {
+                       return 'search?tag=' . urlencode(substr($search, 1));
+               } else {
+                       return 'search?q=' . urlencode($search);
+               }
        }
 }