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

rework perm_is_allowed

Browse Source
This commit is contained in:
redmatrix 2016-07-13 20:23:20 -07:00
parent 0aa205044b
commit 503b420292
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/permissions.php
View File

@ -81,7 +81,7 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
$ret = array(); $ret = array();
$abperms = (($uid && $observer_xchan) ? load_abconfig($uid,$observer_xchan) : array()); $abperms = (($uid && $observer_xchan) ? load_abconfig($uid,$observer_xchan,'my_perms') : array());
foreach($global_perms as $perm_name => $permission) { foreach($global_perms as $perm_name => $permission) {
@ -333,7 +333,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission) {
dbesc($observer_xchan) dbesc($observer_xchan)
); );
} }
$abperms = load_abconfig($uid,$observer_xchan); $abperms = load_abconfig($uid,$observer_xchan,'my_perms');
} }
@ -407,8 +407,12 @@ function perm_is_allowed($uid, $observer_xchan, $permission) {
// Permission granted to certain channels. Let's see if the observer is one of them // Permission granted to certain channels. Let's see if the observer is one of them
if(($r) && ($channel_perm & PERMS_SPECIFIC)) { if(($r) && ($channel_perm & PERMS_SPECIFIC)) {
if(array_key_exists('my_perms',$abperms) && array_key_exists($permission,$abperms['my_perms']) && $abperms['my_perms'][$permission]) { if($abperms) {
return true; foreach($abperms as $ab) {
if($ab['cat'] == 'my_perms' && $ab['k'] == $permission) {
return ((intval($ab['v'])) ? true : false);
}
}
} }
} }