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

update api perm_allowed to return all perms if no perm specified

Browse Source
This commit is contained in:
zotlabs 2016-11-14 20:59:10 -08:00
parent e0a83b4b94
commit 3e286f4f19
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/api_zot.php
View File

@ -311,9 +311,6 @@
return false; return false;
$perm = ((array_key_exists('perm',$_REQUEST)) ? $_REQUEST['perm'] : ''); $perm = ((array_key_exists('perm',$_REQUEST)) ? $_REQUEST['perm'] : '');
// possibly should return all perms
if(! $perm)
return false;
if(array_key_exists('abook_id',$_REQUEST) && intval($_REQUEST['abook_id'])) { if(array_key_exists('abook_id',$_REQUEST) && intval($_REQUEST['abook_id'])) {
$r = q("select abook_xchan as xchan_hash from abook where abook_id = %d and abook_channel = %d limit 1", $r = q("select abook_xchan as xchan_hash from abook where abook_id = %d and abook_channel = %d limit 1",
@ -324,10 +321,24 @@
else { else {
$r = xchan_fetch($_REQUEST); $r = xchan_fetch($_REQUEST);
} }
if($r)
$x = [ [ 'perm' => $perm, 'allowed' => perm_is_allowed(api_user(), $r[0]['xchan_hash'], $perm)] ];
$x = false;
if($r) {
if($perm)
$x = [ [ 'perm' => $perm, 'allowed' => perm_is_allowed(api_user(), $r[0]['xchan_hash'], $perm)] ];
else {
$x = [];
$p = get_all_perms(api_user(),$r[0]['xchan_hash']);
if($p) {
foreach($p as $k => $v)
$x[] = [ 'perm' => $k, 'allowed' => $v ];
}
}
}
json_return_and_die($x); json_return_and_die($x);
} }
function red_item_new($type) { function red_item_new($type) {