Merge pull request #6694 from Quix0r/rewrites/added-missing-var-init

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 809a6f7e86e50f013546c90545289cf9d71ad3bc..9a70bcac908d179d3512761284bd8dd64b431a17 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
@@ -16,17 +15,14 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Util\Strings;
 
-require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
 
 function search_saved_searches() {
 
        $o = '';
-       $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
-
-       if (!Feature::isEnabled(local_user(),'savedsearch'))
-               return $o;
+       $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
                intval(local_user())
@@ -62,10 +58,10 @@ function search_saved_searches() {
 
 function search_init(App $a) {
 
-       $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+       $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 
        if (local_user()) {
-               if (x($_GET,'save') && $search) {
+               if (!empty($_GET['save']) && $search) {
                        $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
                                intval(local_user()),
                                DBA::escape($search)
@@ -74,7 +70,7 @@ function search_init(App $a) {
                                DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
                        }
                }
-               if (x($_GET,'remove') && $search) {
+               if (!empty($_GET['remove']) && $search) {
                        DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
                }
 
@@ -94,14 +90,6 @@ function search_init(App $a) {
 
 }
 
-
-
-function search_post(App $a) {
-       if (x($_POST,'search'))
-               $a->data['search'] = $_POST['search'];
-}
-
-
 function search_content(App $a) {
 
        if (Config::get('system','block_public') && !local_user() && !remote_user()) {
@@ -113,7 +101,7 @@ function search_content(App $a) {
                System::httpExit(403,
                                ["title" => L10n::t("Public access denied."),
                                        "description" => L10n::t("Only logged in users are permitted to perform a search.")]);
-               killme();
+               exit();
                //notice(L10n::t('Public access denied.').EOL);
                //return;
        }
@@ -138,7 +126,7 @@ function search_content(App $a) {
                                System::httpExit(429,
                                                ["title" => L10n::t("Too Many Requests"),
                                                        "description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
-                               killme();
+                               exit();
                        }
                        Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), Cache::HOUR);
                } else
@@ -147,16 +135,12 @@ function search_content(App $a) {
 
        Nav::setSelected('search');
 
-       $search = '';
-       if (x($a->data,'search'))
-               $search = notags(trim($a->data['search']));
-       else
-               $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+       $search = (!empty($_REQUEST['search']) ? Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) : '');
 
        $tag = false;
-       if (x($_GET,'tag')) {
+       if (!empty($_GET['tag'])) {
                $tag = true;
-               $search = (x($_GET,'tag') ? '#' . notags(trim(rawurldecode($_GET['tag']))) : '');
+               $search = (!empty($_GET['tag']) ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : '');
        }
 
        // contruct a wrapper for the search header
@@ -164,7 +148,7 @@ function search_content(App $a) {
                'name' => "search-header",
                '$title' => L10n::t("Search"),
                '$title_size' => 3,
-               '$content' => HTML::search($search,'search-box','search',((local_user()) ? true : false), false)
+               '$content' => HTML::search($search,'search-box','search', false)
        ]);
 
        if (strpos($search,'#') === 0) {
@@ -178,7 +162,7 @@ function search_content(App $a) {
                return dirfind_content($a);
        }
 
-       if (x($_GET,'search-option'))
+       if (!empty($_GET['search-option']))
                switch($_GET['search-option']) {
                        case 'fulltext':
                                break;