really nitty permission tweaking

diff --git a/include/security.php b/include/security.php
index 56d4cad36fa529eb821b48692e1cb9aceef5f478..d92f48a084e6fd226f091d98252fb75727bb25e6 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -266,8 +266,14 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
         * Profile owner - everything is visible
         */
 
-       if(($local_user) && ($local_user == $owner_id)) {
-               $sql = ''; 
+       if($local_user) {
+               if($local_user == $owner_id) {
+                       $sql = '';
+               }
+               else {
+                       /* logged in user can see hidden walls and feeds that are blocked to unknown users (private == 2) */
+                       $sql = " AND private != 1 "; 
+               }
        }
 
        /**
@@ -300,7 +306,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
                        } 
 
                        $sql = sprintf(
-                               " AND ( private = 0 OR ( private = 1 AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
+                               " AND ( private = 0 OR ( private in (1,2) AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
                                  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
                                  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
                                  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s')))