Merge pull request #10 from duthied/master

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 33032e183234b706c45b98fbd8ddf1f4104f8d28..396b50738efd0869adbf42fea044cb6a6d800e8e 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,5 +1,60 @@
 <?php
 
+function search_saved_searches() {
+
+       $o = '';
+
+       $r = q("select `term` from `search` WHERE `uid` = %d",
+               intval(local_user())
+       );
+
+       if(count($r)) {
+               $o .= '<div id="saved-search-list" class="widget">';
+               $o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
+               $o .= '<ul id="saved-search-ul">' . "\r\n";
+               foreach($r as $rr) {
+                       $o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
+               }
+               $o .= '</ul></div>' . "\r\n";
+       }               
+
+       return $o;
+
+}
+
+
+function search_init(&$a) {
+
+       $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['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(! count($r)) {
+                               q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ",
+                                       intval(local_user()),
+                                       dbesc($search)
+                               );
+                       }
+               }
+               if(x($_GET,'remove') && $search) {
+                       q("delete from `search` where `uid` = %d and `term` = '%s' limit 1",
+                               intval(local_user()),
+                               dbesc($search)
+                       );
+               }
+
+               $a->page['aside'] .= search_saved_searches();
+
+       }
+
+
+}
+
+
 
 function search_post(&$a) {
        if(x($_POST,'search'))
@@ -13,6 +68,8 @@ function search_content(&$a) {
                notice( t('Public access denied.') . EOL);
                return;
        }
+       
+       nav_set_selected('search');
 
        require_once("include/bbcode.php");
        require_once('include/security.php');
@@ -30,18 +87,14 @@ function search_content(&$a) {
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       $o .= search($search);
+       $o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
        if(! $search)
                return $o;
 
-
-       $sql_extra = "
-               AND `item`.`allow_cid` = '' 
-               AND `item`.`allow_gid` = '' 
-               AND `item`.`deny_cid`  = '' 
-               AND `item`.`deny_gid`  = '' 
-       ";
+       // Here is the way permissions work in the search module...
+       // Only public wall posts can be shown
+       // OR your own posts if you are a logged in member
 
        $s_bool  = "AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )";
        $s_regx  = "AND `item`.`body` REGEXP '%s' ";
@@ -52,12 +105,12 @@ function search_content(&$a) {
                $search_alg = $s_regx;
 
        $r = q("SELECT COUNT(*) AS `total`
-               FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+               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 ( `wall` = 1 OR `contact`.`uid` = %d )
+               AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0) 
+                       OR `item`.`uid` = %d )
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               $search_alg
-               $sql_extra ",
+               $search_alg ",
                intval(local_user()),
                dbesc($search)
        );
@@ -66,7 +119,7 @@ function search_content(&$a) {
                $a->set_pager_total($r[0]['total']);
 
        if(! $r[0]['total']) {
-               notice( t('No results.') . EOL);
+               info( t('No results.') . EOL);
                return $o;
        }
 
@@ -76,18 +129,21 @@ function search_content(&$a) {
                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
                `user`.`nickname`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-               LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` 
+               LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-               AND ( `wall` = 1 OR `contact`.`uid` = %d )
+               AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 ) 
+                       OR `item`.`uid` = %d )
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $search_alg
-               $sql_extra
-               ORDER BY `parent` DESC ",
+               ORDER BY `received` DESC LIMIT %d , %d ",
                intval(local_user()),
-               dbesc($search)
-       );
+               dbesc($search),
+               intval($a->pager['start']),
+               intval($a->pager['itemspage'])
 
+       );
 
+       $o .= '<h2>Search results for: ' . $search . '</h2>';
 
        $o .= conversation($a,$r,'search',false);