update for ES thx Albert

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index f274b2a8798f6139e16ac11af1aa440e5d164d83..1d28fe141ac6a15642176ee3f6f473579eae43c7 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,4 +1,7 @@
 <?php
+
+use Friendica\App;
+
 require_once("include/bbcode.php");
 require_once('include/security.php');
 require_once('include/conversation.php');
@@ -8,7 +11,7 @@ function search_saved_searches() {
 
        $o = '';
 
-       if(! feature_enabled(local_user(),'savedsearch'))
+       if (! feature_enabled(local_user(),'savedsearch'))
                return $o;
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
@@ -47,30 +50,23 @@ function search_init(App $a) {
 
        $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       if(local_user()) {
-               if(x($_GET,'save') && $search) {
+       if (local_user()) {
+               if (x($_GET,'save') && $search) {
                        $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
                                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)
-                       );
+               if (x($_GET,'remove') && $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']);
        }
@@ -82,19 +78,19 @@ function search_init(App $a) {
 
 
 function search_post(App $a) {
-       if(x($_POST,'search'))
+       if (x($_POST,'search'))
                $a->data['search'] = $_POST['search'];
 }
 
 
 function search_content(App $a) {
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+       if (get_config('system','block_public') && !local_user() && !remote_user()) {
+               notice(t('Public access denied.') . EOL);
                return;
        }
 
-       if(get_config('system','local_search') AND !local_user()) {
+       if (get_config('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,7 +99,7 @@ function search_content(App $a) {
                //return;
        }
 
-       if (get_config('system','permit_crawling') AND !local_user()) {
+       if (get_config('system','permit_crawling') && !local_user() && !remote_user()) {
                // Default values:
                // 10 requests are "free", after the 11th only a call per minute is allowed
 
@@ -119,7 +115,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.")));
@@ -132,13 +128,13 @@ function search_content(App $a) {
 
        nav_set_selected('search');
 
-       if(x($a->data,'search'))
+       if (x($a->data,'search'))
                $search = notags(trim($a->data['search']));
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
        $tag = false;
-       if(x($_GET,'tag')) {
+       if (x($_GET,'tag')) {
                $tag = true;
                $search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
        }
@@ -151,18 +147,18 @@ function search_content(App $a) {
                '$content' => search($search,'search-box','search',((local_user()) ? true : false), false)
        ));
 
-       if(strpos($search,'#') === 0) {
+       if (strpos($search,'#') === 0) {
                $tag = true;
                $search = substr($search,1);
        }
-       if(strpos($search,'@') === 0) {
+       if (strpos($search,'@') === 0) {
                return dirfind_content($a);
        }
-       if(strpos($search,'!') === 0) {
+       if (strpos($search,'!') === 0) {
                return dirfind_content($a);
        }
 
-       if(x($_GET,'search-option'))
+       if (x($_GET,'search-option'))
                switch($_GET['search-option']) {
                        case 'fulltext':
                                break;
@@ -177,7 +173,7 @@ function search_content(App $a) {
                                break;
                }
 
-       if(! $search)
+       if (! $search)
                return $o;
 
        if (get_config('system','only_tag_search'))
@@ -188,7 +184,7 @@ 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.
 
-       if($tag) {
+       if ($tag) {
                logger("Start tag search for '".$search."'", LOGGER_DEBUG);
 
                $r = q("SELECT %s
@@ -203,12 +199,7 @@ 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
@@ -226,7 +217,7 @@ function search_content(App $a) {
        }
 
 
-       if($tag)
+       if ($tag)
                $title = sprintf( t('Items tagged with: %s'), $search);
        else
                $title = sprintf( t('Results for: %s'), $search);