keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[privacy] rework latest fix

Browse source
This commit is contained in:
friendica 2012-03-06 17:21:14 -08:00
parent 39a49d51e3
commit 88cd5800cf
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/security.php
View file

@ -159,6 +159,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
AND allow_gid = '' AND allow_gid = ''
AND deny_cid = '' AND deny_cid = ''
AND deny_gid = '' AND deny_gid = ''
AND private = 0
"; ";
/** /**
@ -199,10 +200,11 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
} }
$sql = sprintf( $sql = sprintf(
" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) " AND (( allow_cid = '' OR allow_cid REGEXP '<%d>' )
AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s') AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s')
OR private = 0 )
", ",
intval($remote_user), intval($remote_user),
intval($remote_user), intval($remote_user),

3
mod/display.php
View file

@ -87,9 +87,6 @@ function display_content(&$a) {
$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
if(! local_user() && ! remote_user())
$sql_extra .= " and `item`.`private` = 0 ";
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,