Use correct entry list in Module\Directory

[friendica.git/.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 9a70bca..4144e26 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -12,13 +12,11 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Module\BaseSearchModule;
 use Friendica\Util\Strings;
 
-require_once 'mod/dirfind.php';
-
 function search_saved_searches() {
 
        $o = '';
@@ -98,12 +96,9 @@ function search_content(App $a) {
        }
 
        if (Config::get('system','local_search') && !local_user() && !remote_user()) {
-               System::httpExit(403,
-                               ["title" => L10n::t("Public access denied."),
-                                       "description" => L10n::t("Only logged in users are permitted to perform a search.")]);
-               exit();
-               //notice(L10n::t('Public access denied.').EOL);
-               //return;
+               $e = new \Friendica\Network\HTTPException\ForbiddenException(L10n::t("Only logged in users are permitted to perform a search."));
+               $e->httpdesc = L10n::t("Public access denied.");
+               throw $e;
        }
 
        if (Config::get('system','permit_crawling') && !local_user() && !remote_user()) {
@@ -123,10 +118,7 @@ function search_content(App $a) {
                if (!is_null($result)) {
                        $resultdata = json_decode($result);
                        if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
-                               System::httpExit(429,
-                                               ["title" => L10n::t("Too Many Requests"),
-                                                       "description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
-                               exit();
+                               throw new \Friendica\Network\HTTPException\TooManyRequestsException(L10n::t("Only one search per minute is permitted for not logged in users."));
                        }
                        Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), Cache::HOUR);
                } else
@@ -156,10 +148,10 @@ function search_content(App $a) {
                $search = substr($search,1);
        }
        if (strpos($search,'@') === 0) {
-               return dirfind_content($a);
+               return BaseSearchModule::performSearch();
        }
        if (strpos($search,'!') === 0) {
-               return dirfind_content($a);
+               return BaseSearchModule::performSearch();
        }
 
        if (!empty($_GET['search-option']))
@@ -170,11 +162,9 @@ function search_content(App $a) {
                                $tag = true;
                                break;
                        case 'contacts':
-                               return dirfind_content($a, "@");
-                               break;
+                               return BaseSearchModule::performSearch('@');
                        case 'forums':
-                               return dirfind_content($a, "!");
-                               break;
+                               return BaseSearchModule::performSearch('!');
                }
 
        if (!$search)