Merge pull request #4065 from annando/dbstructure-class

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index d0738575367f3146909bb5e7bf56761ee658fae9..c17b11c5d9a46c3025d143232da52a6c68e2a30c 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,21 +1,30 @@
 <?php
-require_once("include/bbcode.php");
-require_once('include/security.php');
-require_once('include/conversation.php');
-require_once('mod/dirfind.php');
+/**
+ * @file mod/search.php
+ */
+use Friendica\App;
+use Friendica\Content\Feature;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
+require_once "include/bbcode.php";
+require_once 'include/security.php';
+require_once 'include/conversation.php';
+require_once 'mod/dirfind.php';
 
 function search_saved_searches() {
 
        $o = '';
 
-       if (! feature_enabled(local_user(),'savedsearch'))
+       if (! Feature::isEnabled(local_user(),'savedsearch'))
                return $o;
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
                intval(local_user())
        );
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $saved = array();
                foreach ($r as $rr) {
                        $saved[] = array(
@@ -53,24 +62,17 @@ function search_init(App $a) {
                                intval(local_user()),
                                dbesc($search)
                        );
-                       if (! dbm::is_result($r)) {
-                               q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')",
-                                       intval(local_user()),
-                                       dbesc($search)
-                               );
+                       if (!DBM::is_result($r)) {
+                               dba::insert('search', array('uid' => local_user(), 'term' => $search));
                        }
                }
                if (x($_GET,'remove') && $search) {
-                       q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
-                               intval(local_user()),
-                               dbesc($search)
-                       );
+                       dba::delete('search', array('uid' => local_user(), 'term' => $search));
                }
 
                $a->page['aside'] .= search_saved_searches();
 
-       }
-       else {
+       } else {
                unset($_SESSION['theme']);
                unset($_SESSION['mobile-theme']);
        }
@@ -89,12 +91,12 @@ function search_post(App $a) {
 
 function search_content(App $a) {
 
-       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+       if (Config::get('system','block_public') && !local_user() && !remote_user()) {
+               notice(t('Public access denied.') . EOL);
                return;
        }
 
-       if (get_config('system','local_search') AND !local_user()) {
+       if (Config::get('system','local_search') && !local_user() && !remote_user()) {
                http_status_exit(403,
                                array("title" => t("Public access denied."),
                                        "description" => t("Only logged in users are permitted to perform a search.")));
@@ -103,15 +105,15 @@ function search_content(App $a) {
                //return;
        }
 
-       if (get_config('system','permit_crawling') AND !local_user()) {
+       if (Config::get('system','permit_crawling') && !local_user() && !remote_user()) {
                // Default values:
                // 10 requests are "free", after the 11th only a call per minute is allowed
 
-               $free_crawls = intval(get_config('system','free_crawls'));
+               $free_crawls = intval(Config::get('system','free_crawls'));
                if ($free_crawls == 0)
                        $free_crawls = 10;
 
-               $crawl_permit_period = intval(get_config('system','crawl_permit_period'));
+               $crawl_permit_period = intval(Config::get('system','crawl_permit_period'));
                if ($crawl_permit_period == 0)
                        $crawl_permit_period = 10;
 
@@ -119,7 +121,7 @@ function search_content(App $a) {
                $result = Cache::get("remote_search:".$remote);
                if (!is_null($result)) {
                        $resultdata = json_decode($result);
-                       if (($resultdata->time > (time() - $crawl_permit_period)) AND ($resultdata->accesses > $free_crawls)) {
+                       if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
                                http_status_exit(429,
                                                array("title" => t("Too Many Requests"),
                                                        "description" => t("Only one search per minute is permitted for not logged in users.")));
@@ -180,7 +182,7 @@ function search_content(App $a) {
        if (! $search)
                return $o;
 
-       if (get_config('system','only_tag_search'))
+       if (Config::get('system','only_tag_search'))
                $tag = true;
 
        // Here is the way permissions work in the search module...
@@ -203,24 +205,19 @@ function search_content(App $a) {
        } else {
                logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
-               // Disabled until finally is decided how to proceed with this
-               //if (get_config('system','use_fulltext_engine')) {
-               //      $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
-               //} else {
-                       $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
-               //}
+               $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
 
                $r = q("SELECT %s
                        FROM `item` %s
                        WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
                                $sql_extra
-                       GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d",
+                       GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d",
                                item_fieldlists(), item_joins(), item_condition(),
                                intval(local_user()),
                                intval($a->pager['start']), intval($a->pager['itemspage']));
        }
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                info( t('No results.') . EOL);
                return $o;
        }