Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index ac848a0ceced8af051aee13655c98c95155d61f3..f7d235d4581dec743f4986d4fd1c35ecdd9b230c 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,6 +4,9 @@ function search_saved_searches() {
 
        $o = '';
 
+       if(! feature_enabled(local_user(),'savedsearch'))
+               return $o;
+
        $r = q("select `id`,`term` from `search` WHERE `uid` = %d",
                intval(local_user())
        );
@@ -20,7 +23,7 @@ function search_saved_searches() {
                        );
                }
 
-               
+
                $tpl = get_markup_template("saved_searches_aside.tpl");
 
                $o .= replace_macros($tpl, array(
@@ -29,7 +32,7 @@ function search_saved_searches() {
                        '$searchbox' => '',
                        '$saved'         => $saved,
                ));
-       }               
+       }
 
        return $o;
 
@@ -121,7 +124,10 @@ function search_content(&$a) {
        if(! $search)
                return $o;
 
-       if (get_config('system','use_fulltext_engine')) {
+       if (get_config('system','only_tag_search'))
+               $tag = true;
+
+       /*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
@@ -131,26 +137,41 @@ function search_content(&$a) {
                        $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))));
-       }
-
+       }*/
 
+       if($tag) {
+               //$sql_extra = sprintf(" AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d",
+               //                      dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
+               //$sql_table = "`term` LEFT JOIN `item` ON `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` ";
 
+               $sql_extra = sprintf(" AND EXISTS (SELECT * FROM `term` WHERE `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d) GROUP BY `item`.`uri` ",
+                                       dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
+               $sql_table = "`item` FORCE INDEX (`uri`) ";
+       } else {
+               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_table = "`item`";
+       }
 
        // Here is the way permissions work in the search module...
        // Only public posts can be shown
        // 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(! get_pconfig(local_user(),'system','alt_pager')) {
+       if( (! get_config('alt_pager', 'global')) && (! 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`
+                       FROM $sql_table 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 )
+                               OR ( `item`.`uid` = %d ))
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       $sql_extra group by `item`.`uri` ", 
+                       $sql_extra ",
                        intval(local_user())
                );
+//                     $sql_extra group by `item`.`uri` ",
 
                if(count($r))
                        $a->set_pager_total(count($r));
@@ -161,25 +182,25 @@ function search_content(&$a) {
                }
        }
 
-       $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
+       $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, 
                `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`
-               FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+               `user`.`nickname`, `user`.`uid`, `user`.`hidewall`
+               FROM $sql_table 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 )
+                       OR ( `item`.`uid` = %d ))
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $sql_extra
-               group by `item`.`uri`   
                ORDER BY `received` DESC LIMIT %d , %d ",
                intval(local_user()),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
 
        );
+//             group by `item`.`uri`
 
        if(! count($r)) {
                info( t('No results.') . EOL);
@@ -194,11 +215,11 @@ function search_content(&$a) {
 
        $o .= conversation($a,$r,'search',false);
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
-               $o .= paginate($a);
+       if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+               $o .= alt_pager($a,count($r));
        }
        else {
-               $o .= alt_pager($a,count($r));
+               $o .= paginate($a);
        }
 
        return $o;