fix photos after permissions_sql change

diff --git a/include/security.php b/include/security.php
index c0449157096bdbf94ab0aebc8458d267ee7ae44c..9042d4d6436474ca46beb6bd61c5753d4ac4d45e 100755 (executable)
--- a/include/security.php
+++ b/include/security.php
@@ -149,6 +149,77 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
        $local_user = local_user();
        $remote_user = remote_user();
 
+       /**
+        * Construct permissions
+        *
+        * default permissions - anonymous user
+        */
+
+       $sql = " AND allow_cid = '' 
+                        AND allow_gid = '' 
+                        AND deny_cid  = '' 
+                        AND deny_gid  = '' 
+       ";
+
+       /**
+        * Profile owner - everything is visible
+        */
+
+       if(($local_user) && ($local_user == $owner_id)) {
+               $sql = ''; 
+       }
+
+       /**
+        * Authenticated visitor. Unless pre-verified, 
+        * check that the contact belongs to this $owner_id
+        * and load the groups the visitor belongs to.
+        * If pre-verified, the caller is expected to have already
+        * done this and passed the groups into this function.
+        */
+
+       elseif($remote_user) {
+
+               if(! $remote_verified) {
+                       $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
+                               intval($remote_user),
+                               intval($owner_id)
+                       );
+                       if(count($r)) {
+                               $remote_verified = true;
+                               $groups = init_groups_visitor($remote_user);
+                       }
+               }
+               if($remote_verified) {
+               
+                       $gs = '<<>>'; // should be impossible to match
+
+                       if(is_array($groups) && count($groups)) {
+                               foreach($groups as $g)
+                                       $gs .= '|<' . intval($g) . '>';
+                       } 
+
+                       $sql = sprintf(
+                               " 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')
+                               ",
+                               intval($remote_user),
+                               intval($remote_user),
+                               dbesc($gs),
+                               dbesc($gs)
+                       );
+               }
+       }
+       return $sql;
+}
+
+
+function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+
+       $local_user = local_user();
+       $remote_user = remote_user();
+
        /**
         * Construct permissions
         *
@@ -200,11 +271,10 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
                        } 
 
                        $sql = sprintf(
-                               " AND (( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
+                               " AND ( private = 0 OR (( 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') 
-                                       OR private = 0 )
+                                 AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s'))) 
                                ",
                                intval($remote_user),
                                intval($remote_user),
@@ -214,4 +284,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
                }
        }
        return $sql;
-}
\ No newline at end of file
+}
+
+

diff --git a/mod/display.php b/mod/display.php
index f510f793df9d98b2e05356ab6c0b387da0b5a515..f428149e830792819e278c25f004e12c08dff9b4 100755 (executable)
--- a/mod/display.php
+++ b/mod/display.php
@@ -85,7 +85,7 @@ function display_content(&$a) {
                $o .= status_editor($a,$x,0,true);
 
 
-       $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+       $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,

diff --git a/mod/profile.php b/mod/profile.php
index 74e1a2302002e8e48d4ed34944e2fb09f69e8447..1a701f40773bcfc12d4ace04c620e906ffdc2640 100755 (executable)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) {
         * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
         */
 
-       $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+       $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
 
        if($update) {