diff options
Diffstat (limited to 'mod/search.php')
| -rw-r--r-- | mod/search.php | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/mod/search.php b/mod/search.php index 9c82b38e8..c20d1274e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -35,13 +35,9 @@ function search_content(&$a) { 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 +48,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 `profile` ON `profile`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND ( `wall` = 1 OR `contact`.`uid` = %d ) - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $search_alg - $sql_extra ", + AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `profile`.`hidewall` = 0) + OR `item`.`uid` = %d ) + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `profile`.`is-default` = 1 + $search_alg ", intval(local_user()), dbesc($search) ); @@ -74,14 +70,15 @@ 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` + `user`.`nickname`, `profile`.`hidewall` 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` + LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND ( `wall` = 1 OR `contact`.`uid` = %d ) - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `profile`.`hidewall` = 0 ) + OR `item`.`uid` = %d ) + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `profile`.`is-default` = 1 $search_alg - $sql_extra ORDER BY `parent` DESC ", intval(local_user()), dbesc($search) |