Move Global Functions - Part 3

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 8f89e72001078905eab52d6cf59a73eb10af8614..80b1c184ff9e1b6129c2ecf524fe6180dcd4a31a 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/search.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -9,10 +10,9 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/security.php';
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
 
@@ -28,7 +28,7 @@ function search_saved_searches() {
                intval(local_user())
        );
 
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                $saved = [];
                foreach ($r as $rr) {
                        $saved[] = [
@@ -64,14 +64,14 @@ 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 (!DBM::is_result($r)) {
-                               dba::insert('search', ['uid' => local_user(), 'term' => $search]);
+                       if (!DBA::isResult($r)) {
+                               DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
                        }
                }
                if (x($_GET,'remove') && $search) {
-                       dba::delete('search', ['uid' => local_user(), 'term' => $search]);
+                       DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
                }
 
                /// @todo Check if there is a case at all that "aside" is prefilled here
@@ -136,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');
@@ -208,13 +208,13 @@ function search_content(App $a) {
                        local_user(), TERM_OBJ_POST, TERM_HASHTAG, $search];
                $params = ['order' => ['created' => true],
                        'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-               $terms = dba::select('term', ['oid'], $condition, $params);
+               $terms = DBA::select('term', ['oid'], $condition, $params);
 
                $itemids = [];
-               while ($term = dba::fetch($terms)) {
+               while ($term = DBA::fetch($terms)) {
                        $itemids[] = $term['oid'];
                }
-               dba::close($terms);
+               DBA::close($terms);
 
                if (!empty($itemids)) {
                        $params = ['order' => ['id' => true]];
@@ -235,7 +235,7 @@ function search_content(App $a) {
                $r = Item::inArray($items);
        }
 
-       if (!DBM::is_result($r)) {
+       if (!DBA::isResult($r)) {
                info(L10n::t('No results.') . EOL);
                return $o;
        }