search privacy enhancements for those with blocked walls

diff --git a/mod/item.php b/mod/item.php
index 2ed1b812a48cb22cc51ed31dfcb40e58e906dede..05b3395fdb8ea5399612c16716439ab4f8529541 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -248,6 +248,10 @@ function item_post(&$a) {
 
                $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
+
+               if($user['hidewall'])
+                       $private = 2;
+
                // If this is a comment, set the permissions from the parent.
 
                if($parent_item) {

diff --git a/mod/search.php b/mod/search.php
index 956816fed0ec7dc5212f4274454e5cc4a29b1e41..2753c2e1e50afba57db0db108ab7096572da64eb 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -149,7 +149,7 @@ function search_content(&$a) {
                        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 )
+                               OR ( `item`.`uid` = %d ))
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        $sql_extra group by `item`.`uri` ", 
                        intval(local_user())
@@ -168,12 +168,12 @@ function search_content(&$a) {
                `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`
+               `user`.`nickname`, `user`.`uid`, `user`.`hidewall`
                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 )
+                       OR ( `item`.`uid` = %d ))
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $sql_extra
                group by `item`.`uri`