workaround to clean up orphaned filetags

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
old mode 100755 (executable)
new mode 100644 (file)
index 50e7a6a..d467764
--- a/mod/search.php
+++ b/mod/search.php
@@ -87,40 +87,49 @@ function search_content(&$a) {
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
+       $tag = false;
+       if(x($_GET,'tag')) {
+               $tag = true;
+               $search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
+       }
+
+
        $o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
        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)));
+
+
+
+
        // 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. 
 
-       $s_regx  = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
-               dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\['));
-
-       $search_alg = $s_regx;
-
-       $r = q("SELECT COUNT(*) AS `total`
+       $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
-               $search_alg ",
+               $sql_extra group by `item`.`uri` ", 
                intval(local_user())
        );
 
        if(count($r))
-               $a->set_pager_total($r[0]['total']);
-
-       if(! $r[0]['total']) {
+               $a->set_pager_total(count($r));
+       if(! count($r)) {
                info( t('No results.') . EOL);
                return $o;
        }
 
-       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+       $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@@ -131,7 +140,8 @@ function search_content(&$a) {
                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
-               $search_alg
+               $sql_extra
+               group by `item`.`uri`   
                ORDER BY `received` DESC LIMIT %d , %d ",
                intval(local_user()),
                intval($a->pager['start']),
@@ -139,7 +149,10 @@ function search_content(&$a) {
 
        );
 
-       $o .= '<h2>Search results for: ' . $search . '</h2>';
+       if($tag) 
+               $o .= '<h2>Items tagged with: ' . $search . '</h2>';
+       else
+               $o .= '<h2>Search results for: ' . $search . '</h2>';
 
        $o .= conversation($a,$r,'search',false);