Merge branch 'newui' of github.com:fabrixxm/friendika into newui

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index c20d1274e635f739a66d062f111f1656bdbdfd2b..f7ce75905a80b23c6616baf39da485d2da594423 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -13,6 +13,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');
@@ -48,11 +50,11 @@ 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` LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid`
+               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 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `profile`.`hidewall` = 0) 
+               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 AND `profile`.`is-default` = 1
+               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $search_alg ",
                intval(local_user()),
                dbesc($search)
@@ -70,18 +72,20 @@ function search_content(&$a) {
                `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`,
-               `user`.`nickname`, `profile`.`hidewall`
+               `user`.`nickname`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-               LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid` 
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-               AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `profile`.`hidewall` = 0 ) 
+               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 AND `profile`.`is-default` = 1
+               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $search_alg
-               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'])
+
        );
 
 
@@ -89,6 +93,7 @@ function search_content(&$a) {
        $o .= conversation($a,$r,'search',false);
 
        $o .= paginate($a);
+       $o .= cc_license();
 
        return $o;
 }