diff options
Diffstat (limited to 'mod/search.php')
| -rw-r--r-- | mod/search.php | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/mod/search.php b/mod/search.php index 1bea720a6..1335ea508 100644 --- a/mod/search.php +++ b/mod/search.php @@ -74,7 +74,7 @@ function search_post(&$a) { } -function search_content(&$a) { +function search_content(&$a,$update = 0, $load = false) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); @@ -153,7 +153,7 @@ function search_content(&$a) { // because browser prefetching might change it on us. We have to deliver it with the page. $o .= '<div id="live-search"></div>' . "\r\n"; - $o .= "<script> var profile_uid = " . $a->profile['profile_uid'] + $o .= "<script> var profile_uid = " . ((intval(local_user())) ? local_user() : (-1)) . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( @@ -171,11 +171,11 @@ function search_content(&$a) { '$nouveau' => '0', '$wall' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), - '$search' => (($tag) ? '#' : '') . $search, + '$search' => (($tag) ? urlencode('#') : '') . $search, '$order' => '', '$file' => '', '$cats' => '', - '$uri' => '', + '$mid' => '', '$dend' => '', '$dbegin' => '' )); @@ -186,20 +186,20 @@ function search_content(&$a) { if(($update) && ($load)) { - $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); - +dbg(1); if($load) { - $r = q("SELECT distinct(uri), item.* from item + $r = q("SELECT distinct mid, id as item_id from item WHERE item_restrict = 0 AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND item_private = 0 ) OR ( `item`.`uid` = %d )) $sql_extra - group by uri ORDER BY created DESC $pager_sql ", + group by mid ORDER BY created DESC $pager_sql ", intval(local_user()), intval(ABOOK_FLAG_BLOCKED) ); +dbg(0); } else { $r = array(); @@ -209,15 +209,15 @@ function search_content(&$a) { if($r) { $parents_str = ids_to_querystr($r,'item_id'); - +dbg(1); $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` - WHERE item_restrict = 0 and - $sql_extra ", - intval($a->profile['profile_uid']), - dbesc($parents_str) + WHERE item_restrict = 0 + $sql_extra and parent in ( $parents_str ) " +// intval($a->profile['profile_uid']), +// dbesc($parents_str) ); - +dbg(0); xchan_query($items); $items = fetch_post_tags($items,true); $items = conv_sort($items,'created'); @@ -228,33 +228,33 @@ function search_content(&$a) { - $r = q("SELECT distinct(`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` - 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 - $sql_extra - group by `item`.`uri` - ORDER BY `received` DESC LIMIT %d , %d ", - intval(local_user()), - intval($a->pager['start']), - intval($a->pager['itemspage']) +// $r = q("SELECT distinct(`item`.`mid`), `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` +// 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 +// $sql_extra +// group by `item`.`mid` +// ORDER BY `received` DESC LIMIT %d , %d ", +// intval(local_user()), +// intval($a->pager['start']), +// intval($a->pager['itemspage']) - ); +// ); // $a = fetch_post_tags($a,true); - if(! count($r)) { - info( t('No results.') . EOL); - return $o; - } +// if(! $items) {// +// info( t('No results.') . EOL); +// return $o; +// } if($tag) @@ -262,9 +262,9 @@ function search_content(&$a) { else $o .= '<h2>Search results for: ' . htmlspecialchars($search) . '</h2>'; - $o .= conversation($a,$r,'search',false); + $o .= conversation($a,$items,'search',$update,'client'); - $o .= alt_pager($a,count($r)); +// $o .= alt_pager($a,count($r)); return $o; } |