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

perms work - settings page

Browse Source
This commit is contained in:
redmatrix 2016-07-03 22:47:46 -07:00
parent 916e088462
commit 2a26b0ae91
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Zotlabs/Module/Settings.php
View File

@ -30,7 +30,7 @@ class Settings extends \Zotlabs\Web\Controller {
} }
function post() { function post() {
if(! local_channel()) if(! local_channel())
return; return;
@ -40,7 +40,7 @@ class Settings extends \Zotlabs\Web\Controller {
$channel = \App::get_channel(); $channel = \App::get_channel();
logger('mod_settings: ' . print_r($_REQUEST,true)); // logger('mod_settings: ' . print_r($_REQUEST,true));
if((argc() > 1) && (argv(1) === 'oauth') && x($_POST,'remove')){ if((argc() > 1) && (argv(1) === 'oauth') && x($_POST,'remove')){
@ -311,10 +311,10 @@ class Settings extends \Zotlabs\Web\Controller {
intval(local_channel()) intval(local_channel())
); );
$global_perms = get_perms(); $global_perms = \Zotlabs\Access\Permissions::Perms();
foreach($global_perms as $k => $v) { foreach($global_perms as $k => $v) {
$set_perms .= ', ' . $v[0] . ' = ' . intval($_POST[$k]) . ' '; \Zotlabs\Access\PermissionLimits::Set(local_channel(),$k,intval($_POST[$k]));
} }
$acl = new \Zotlabs\Access\AccessList($channel); $acl = new \Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_POST); $acl->set_from_array($_POST);
@ -370,10 +370,10 @@ class Settings extends \Zotlabs\Web\Controller {
); );
} }
$r = q("update abook set abook_my_perms = %d where abook_channel = %d and abook_self = 1", foreach($global_perms as $k => $v) {
intval((array_key_exists('perms_accept',$role_permissions)) ? $role_permissions['perms_accept'] : 0), set_abconfig(local_channel(),$channel['channel_hash'],'my_perms',$k,((array_key_exists($k,$role_permissions['perms_accept'])) ? intval($role_permissions['perms_accept'][$k])));
intval(local_channel()) }
);
set_pconfig(local_channel(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0)); set_pconfig(local_channel(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0));
foreach($role_permissions as $p => $v) { foreach($role_permissions as $p => $v) {
@ -864,11 +864,7 @@ class Settings extends \Zotlabs\Web\Controller {
return $o; return $o;
} }
if(argv(1) === 'channel') { if(argv(1) === 'channel') {
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
@ -885,9 +881,8 @@ class Settings extends \Zotlabs\Web\Controller {
$channel = \App::get_channel(); $channel = \App::get_channel();
$global_perms = \Zotlabs\Access\Permissions::Perms();
$global_perms = get_perms();
$permiss = array(); $permiss = array();
$perm_opts = array( $perm_opts = array(
@ -905,15 +900,13 @@ class Settings extends \Zotlabs\Web\Controller {
foreach($global_perms as $k => $perm) { foreach($global_perms as $k => $perm) {
$options = array(); $options = array();
foreach($perm_opts as $opt) { foreach($perm_opts as $opt) {
if((! $perm[2]) && $opt[1] == PERMS_PUBLIC)
continue;
$options[$opt[1]] = $opt[0]; $options[$opt[1]] = $opt[0];
} }
$permiss[] = array($k,$perm[3],$channel[$perm[0]],$perm[4],$options); $permiss[] = array($k,$perm,$channel[$perm[0]],$perm[4],$options);
} }
// logger('permiss: ' . print_r($permiss,true)); // logger('permiss: ' . print_r($permiss,true));