harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 'block_public' checking to get_all_perms() and perm_is_allowed() so we have everything related to allowing or denying something in one place. Currently this check is done separately in a huge number of places. Now we can start to remove all the extra checks. A couple of them are still necessary, but most are now redundant.

Browse Source
This commit is contained in:
friendica 2014-07-03 19:34:00 -07:00
parent 5ed9444bee
commit 53217ad9a7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/permissions.php
View File

@ -126,6 +126,13 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
} }
} }
// system is blocked to anybody who is not authenticated
if((! $observer_xchan) && intval(get_config('system','block_public'))) {
$ret[$perm_name] = false;
continue;
}
// Check if this $uid is actually the $observer_xchan - if it's your content // Check if this $uid is actually the $observer_xchan - if it's your content
// you always have permission to do anything // you always have permission to do anything
@ -282,6 +289,11 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
} }
} }
// system is blocked to anybody who is not authenticated
if((! $observer_xchan) && intval(get_config('system','block_public')))
return false;
// Check if this $uid is actually the $observer_xchan // Check if this $uid is actually the $observer_xchan
if($r[0]['channel_hash'] === $observer_xchan) if($r[0]['channel_hash'] === $observer_xchan)