Remove join profile table

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 98c593f45fd842e159b5e850713934101229702e..1f8bfe4bc2459a3275bbafcc385ebacfb4904fa0 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -7,8 +7,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -17,35 +15,35 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Term;
-use Friendica\Module\BaseSearchModule;
+use Friendica\Module\BaseSearch;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 
-class Index extends BaseSearchModule
+class Index extends BaseSearch
 {
        public static function content(array $parameters = [])
        {
                $search = (!empty($_GET['q']) ? Strings::escapeTags(trim(rawurldecode($_GET['q']))) : '');
 
-               if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
-                       throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
+               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+                       throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
                }
 
-               if (Config::get('system', 'local_search') && !Session::isAuthenticated()) {
-                       $e = new HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a search.'));
-                       $e->httpdesc = L10n::t('Public access denied.');
+               if (DI::config()->get('system', 'local_search') && !Session::isAuthenticated()) {
+                       $e = new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a search.'));
+                       $e->httpdesc = DI::l10n()->t('Public access denied.');
                        throw $e;
                }
 
-               if (Config::get('system', 'permit_crawling') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'permit_crawling') && !Session::isAuthenticated()) {
                        // Default values:
                        // 10 requests are "free", after the 11th only a call per minute is allowed
 
-                       $free_crawls = intval(Config::get('system', 'free_crawls'));
+                       $free_crawls = intval(DI::config()->get('system', 'free_crawls'));
                        if ($free_crawls == 0)
                                $free_crawls = 10;
 
-                       $crawl_permit_period = intval(Config::get('system', 'crawl_permit_period'));
+                       $crawl_permit_period = intval(DI::config()->get('system', 'crawl_permit_period'));
                        if ($crawl_permit_period == 0)
                                $crawl_permit_period = 10;
 
@@ -54,7 +52,7 @@ class Index extends BaseSearchModule
                        if (!is_null($result)) {
                                $resultdata = json_decode($result);
                                if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
-                                       throw new HTTPException\TooManyRequestsException(L10n::t('Only one search per minute is permitted for not logged in users.'));
+                                       throw new HTTPException\TooManyRequestsException(DI::l10n()->t('Only one search per minute is permitted for not logged in users.'));
                                }
                                DI::cache()->set('remote_search:' . $remote, json_encode(['time' => time(), 'accesses' => $resultdata->accesses + 1]), Duration::HOUR);
                        } else {
@@ -77,7 +75,7 @@ class Index extends BaseSearchModule
                // contruct a wrapper for the search header
                $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('content_wrapper.tpl'), [
                        'name' => 'search-header',
-                       '$title' => L10n::t('Search'),
+                       '$title' => DI::l10n()->t('Search'),
                        '$title_size' => 3,
                        '$content' => HTML::search($search, 'search-box', false)
                ]);
@@ -113,7 +111,7 @@ class Index extends BaseSearchModule
                        }
                }
 
-               $tag = $tag || Config::get('system', 'only_tag_search');
+               $tag = $tag || DI::config()->get('system', 'only_tag_search');
 
                // Here is the way permissions work in the search module...
                // Only public posts can be shown
@@ -167,14 +165,14 @@ class Index extends BaseSearchModule
                }
 
                if (!DBA::isResult($r)) {
-                       info(L10n::t('No results.'));
+                       info(DI::l10n()->t('No results.'));
                        return $o;
                }
 
                if ($tag) {
-                       $title = L10n::t('Items tagged with: %s', $search);
+                       $title = DI::l10n()->t('Items tagged with: %s', $search);
                } else {
-                       $title = L10n::t('Results for: %s', $search);
+                       $title = DI::l10n()->t('Results for: %s', $search);
                }
 
                $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [