send less messages to server; remove delete option

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index d467764b01a57049581ad9f051f9014ae9ab9988..300eb912c13c59412786c36b6c6a9c98974d6959 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -50,8 +50,10 @@ function search_init(&$a) {
                $a->page['aside'] .= search_saved_searches();
 
        }
-       else
+       else {
                unset($_SESSION['theme']);
+               unset($_SESSION['mobile-theme']);
+       }
 
 
 
@@ -71,7 +73,7 @@ function search_content(&$a) {
                notice( t('Public access denied.') . EOL);
                return;
        }
-       
+
        nav_set_selected('search');
 
        require_once("include/bbcode.php");
@@ -80,7 +82,7 @@ function search_content(&$a) {
 
        $o = '<div id="live-search"></div>' . "\r\n";
 
-       $o .= '<h3>' . t('Search This Site') . '</h3>';
+       $o .= '<h3>' . t('Search') . '</h3>';
 
        if(x($a->data,'search'))
                $search = notags(trim($a->data['search']));
@@ -96,13 +98,29 @@ function search_content(&$a) {
 
        $o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
+       if(strpos($search,'#') === 0) {
+               $tag = true;
+               $search = substr($search,1);
+       }
+       if(strpos($search,'@') === 0) {
+               require_once('mod/dirfind.php');
+               return dirfind_content($a);
+       }
+
        if(! $search)
                return $o;
 
-       if($tag)
-               $sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ",  dbesc('\\]' . preg_quote($search) . '\\['));
-       else
-               $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
+       if (get_config('system','use_fulltext_engine')) {
+               if($tag)
+                       $sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.dbesc(protect_sprintf($search)));
+               else
+                       $sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search)));
+       } else {
+               if($tag)
+                       $sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ",  dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
+               else
+                       $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
+       }
 
 
 
@@ -112,25 +130,28 @@ function search_content(&$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. 
 
-       $r = q("SELECT distinct(`item`.`uri`) as `total`
-               FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-               WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-               AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
-                       OR `item`.`uid` = %d )
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               $sql_extra group by `item`.`uri` ", 
-               intval(local_user())
-       );
-
-       if(count($r))
-               $a->set_pager_total(count($r));
-       if(! count($r)) {
-               info( t('No results.') . EOL);
-               return $o;
+       if(! get_pconfig(local_user(),'system','alt_pager')) {
+               $r = q("SELECT distinct(`item`.`uri`) as `total`
+                       FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                       AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
+                               OR `item`.`uid` = %d )
+                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                       $sql_extra group by `item`.`uri` ", 
+                       intval(local_user())
+               );
+
+               if(count($r))
+                       $a->set_pager_total(count($r));
+
+               if(! count($r)) {
+                       info( t('No results.') . EOL);
+                       return $o;
+               }
        }
 
        $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
-               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
                `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
                `user`.`nickname`
@@ -149,6 +170,12 @@ function search_content(&$a) {
 
        );
 
+       if(! count($r)) {
+               info( t('No results.') . EOL);
+               return $o;
+       }
+
+
        if($tag) 
                $o .= '<h2>Items tagged with: ' . $search . '</h2>';
        else
@@ -156,7 +183,12 @@ function search_content(&$a) {
 
        $o .= conversation($a,$r,'search',false);
 
-       $o .= paginate($a);
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
+               $o .= paginate($a);
+       }
+       else {
+               $o .= alt_pager($a,count($r));
+       }
 
        return $o;
 }