Browse Source

fix photos after permissions_sql change

tags/2.38
friendica 8 years ago
parent
commit
7ad2dd6565
3 changed files with 78 additions and 6 deletions
  1. +76
    -4
      include/security.php
  2. +1
    -1
      mod/display.php
  3. +1
    -1
      mod/profile.php

+ 76
- 4
include/security.php View File

@@ -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;
}
}



+ 1
- 1
mod/display.php View File

@@ -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`,


+ 1
- 1
mod/profile.php View File

@@ -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) {


Loading…
Cancel
Save