Move Global Functions - Part 3

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 1d35221af867eb7e90101bf4f8d2e611d2a9840e..80b1c184ff9e1b6129c2ecf524fe6180dcd4a31a 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -13,7 +13,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/security.php';
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
 
@@ -29,7 +28,7 @@ function search_saved_searches() {
                intval(local_user())
        );
 
-       if (DBA::is_result($r)) {
+       if (DBA::isResult($r)) {
                $saved = [];
                foreach ($r as $rr) {
                        $saved[] = [
@@ -65,9 +64,9 @@ function search_init(App $a) {
                if (x($_GET,'save') && $search) {
                        $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
                                intval(local_user()),
-                               dbesc($search)
+                               DBA::escape($search)
                        );
-                       if (!DBA::is_result($r)) {
+                       if (!DBA::isResult($r)) {
                                DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
                        }
                }
@@ -137,9 +136,9 @@ function search_content(App $a) {
                                                        "description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
                                killme();
                        }
-                       Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), CACHE_HOUR);
+                       Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), Cache::HOUR);
                } else
-                       Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => 1]), CACHE_HOUR);
+                       Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => 1]), Cache::HOUR);
        }
 
        Nav::setSelected('search');
@@ -236,7 +235,7 @@ function search_content(App $a) {
                $r = Item::inArray($items);
        }
 
-       if (!DBA::is_result($r)) {
+       if (!DBA::isResult($r)) {
                info(L10n::t('No results.') . EOL);
                return $o;
        }