Log function

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index d64ce7d0e17eafe34edad6e7e7320ca7eba2d574..852043f3000f06606656af1a7aee683896d313df 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -2,17 +2,19 @@
 /**
  * @file mod/search.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 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 +30,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 +66,19 @@ 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
+               if (!isset($a->page['aside'])) {
+                       $a->page['aside'] = '';
                }
 
                $a->page['aside'] .= search_saved_searches();
@@ -131,9 +138,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');
@@ -195,42 +202,44 @@ function search_content(App $a) {
        // OR your own posts if you are a logged in member
        // No items will be shown if the member has a blocked profile wall.
 
+       $pager = new Pager($a->query_string);
+
        if ($tag) {
-               logger("Start tag search for '".$search."'", LOGGER_DEBUG);
+               Logger::log("Start tag search for '".$search."'", LOGGER_DEBUG);
 
                $condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
                        AND `otype` = ? AND `type` = ? AND `term` = ?",
                        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);
+                       'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+               $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]];
                        $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params);
-                       $r = dba::inArray($items);
+                       $r = Item::inArray($items);
                } else {
                        $r = [];
                }
        } else {
-               logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
+               Logger::log("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
                $condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
                        AND `body` LIKE CONCAT('%',?,'%')",
                        local_user(), $search];
                $params = ['order' => ['id' => true],
-                       'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+                       'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
                $items = Item::selectForUser(local_user(), [], $condition, $params);
-               $r = dba::inArray($items);
+               $r = Item::inArray($items);
        }
 
-       if (!DBM::is_result($r)) {
+       if (!DBA::isResult($r)) {
                info(L10n::t('No results.') . EOL);
                return $o;
        }
@@ -246,12 +255,12 @@ function search_content(App $a) {
                '$title' => $title
        ]);
 
-       logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
-       $o .= conversation($a, $r, 'search', false, false, 'commented', local_user());
+       Logger::log("Start Conversation for '".$search."'", LOGGER_DEBUG);
+       $o .= conversation($a, $r, $pager, 'search', false, false, 'commented', local_user());
 
-       $o .= alt_pager($a,count($r));
+       $o .= $pager->renderMinimal(count($r));
 
-       logger("Done '".$search."'", LOGGER_DEBUG);
+       Logger::log("Done '".$search."'", LOGGER_DEBUG);
 
        return $o;
 }