Bugfix: Removed test code.

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 6694fbc780d75aa6ec43cf0b0623803571a0c170..00f379a75c19ac6aa995cf9d66090c8d640e4679 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -23,7 +23,7 @@ function search_saved_searches() {
                        );
                }
 
-               
+
                $tpl = get_markup_template("saved_searches_aside.tpl");
 
                $o .= replace_macros($tpl, array(
@@ -32,7 +32,7 @@ function search_saved_searches() {
                        '$searchbox' => '',
                        '$saved'         => $saved,
                ));
-       }               
+       }
 
        return $o;
 
@@ -124,41 +124,44 @@ function search_content(&$a) {
        if(! $search)
                return $o;
 
-       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))));
-       }
+       if (get_config('system','only_tag_search'))
+               $tag = true;
 
        if($tag) {
-               $sql_extra = sprintf(" AND `tag`.`tag` = '%s' ", '#'.dbesc(protect_sprintf($search)));
-               $sql_table = "`tag` LEFT JOIN `item` ON `item`.`id` = `tag`.`iid`";
-       } else
-               $sql_table = "`item`";
+               $sql_extra = "";
 
+               $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d) AS `term` ON `item`.`id` = `term`.`oid` ",
+                                       dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
 
+               $sql_order = "`item`.`id`";
+       } 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`";
+               $sql_order = "`item`.`id`";
+               //$sql_order = "`item`.`received`";
+       }
 
        // 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. 
+       // No items will be shown if the member has a blocked profile wall.
 
        if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
                $r = q("SELECT distinct(`item`.`uri`) as `total`
-                       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 )
+                       FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       $sql_extra group by `item`.`uri` ", 
+                       INNER 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 ))
+                       $sql_extra ",
                        intval(local_user())
                );
+//                     $sql_extra group by `item`.`uri` ",
 
                if(count($r))
                        $a->set_pager_total(count($r));
@@ -169,25 +172,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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-               LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+               `user`.`nickname`, `user`.`uid`, `user`.`hidewall`
+               FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+               INNER 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`   
-               ORDER BY `received` DESC LIMIT %d , %d ",
+                       OR ( `item`.`uid` = %d ))
+               $sql_extra GROUP BY `item`.`uri`
+               ORDER BY $sql_order 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);
@@ -195,7 +198,7 @@ function search_content(&$a) {
        }
 
 
-       if($tag) 
+       if($tag)
                $o .= '<h2>Items tagged with: ' . $search . '</h2>';
        else
                $o .= '<h2>Search results for: ' . $search . '</h2>';