aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-27 23:04:17 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-27 23:04:17 -0700
commitd05fd9632e4dc60fc3d4043374f6332a1609857f (patch)
tree240c3a7bb6ffca008a58789b607b539262c217e5 /mod/settings.php
parentca0bc2bb7bc2b9e7d81a356a394d47bcb688004c (diff)
downloadvolse-hubzilla-d05fd9632e4dc60fc3d4043374f6332a1609857f.tar.gz
volse-hubzilla-d05fd9632e4dc60fc3d4043374f6332a1609857f.tar.bz2
volse-hubzilla-d05fd9632e4dc60fc3d4043374f6332a1609857f.zip
now we get to the heavy lifting with AccessList stuff
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php31
1 files changed, 12 insertions, 19 deletions
diff --git a/mod/settings.php b/mod/settings.php
index cbd6abafc..8bfff3765 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -311,17 +311,16 @@ function settings_post(&$a) {
foreach($global_perms as $k => $v) {
$set_perms .= ', ' . $v[0] . ' = ' . intval($_POST[$k]) . ' ';
}
-
- $str_group_allow = perms2str($_POST['group_allow']);
- $str_contact_allow = perms2str($_POST['contact_allow']);
- $str_group_deny = perms2str($_POST['group_deny']);
- $str_contact_deny = perms2str($_POST['contact_deny']);
- $r = q("update channel set channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s'
- where channel_id = %d",
- dbesc($str_contact_allow),
- dbesc($str_group_allow),
- dbesc($str_contact_deny),
- dbesc($str_group_deny),
+ $acl = new AccessList($channel);
+ $acl->set_from_array($_POST);
+ $x = $acl->get();
+
+ $r = q("update channel set channel_allow_cid = '%s', channel_allow_gid = '%s',
+ channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d",
+ dbesc($x['allow_cid']),
+ dbesc($x['allow_gid']),
+ dbesc($x['deny_cid']),
+ dbesc($x['deny_gid']),
intval(local_channel())
);
}
@@ -983,14 +982,8 @@ function settings_content(&$a) {
$stpl = get_markup_template('settings.tpl');
- $celeb = false;
-
- $perm_defaults = array(
- 'allow_cid' => $channel['channel_allow_cid'],
- 'allow_gid' => $channel['channel_allow_gid'],
- 'deny_cid' => $channel['channel_deny_cid'],
- 'deny_gid' => $channel['channel_deny_gid']
- );
+ $acl = new AccessList($channel);
+ $perm_defaults = $acl->get();
require_once('include/group.php');
$group_select = mini_group_select(local_channel(),$channel['channel_default_group']);