aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-03 23:57:41 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-03 23:57:41 +0200
commit908e15bc9041f757217ba8d3635a8d83a5544c46 (patch)
tree243561fa211f28529191e103039629288a4b088f /Zotlabs/Module
parentdf27a48e727ee319e3b9ff1f94024d1cf100f350 (diff)
downloadvolse-hubzilla-908e15bc9041f757217ba8d3635a8d83a5544c46.tar.gz
volse-hubzilla-908e15bc9041f757217ba8d3635a8d83a5544c46.tar.bz2
volse-hubzilla-908e15bc9041f757217ba8d3635a8d83a5544c46.zip
multi acl: port events
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Events.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index def5c437b..d27de9989 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -435,6 +435,10 @@ class Events extends \Zotlabs\Web\Controller {
$acl = new \Zotlabs\Access\AccessList($channel);
$perm_defaults = $acl->get();
+
+ $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
+
+ //print_r(acl2json($permissions['allow_gid'])); killme();
$tpl = get_markup_template('event_form.tpl');
@@ -467,10 +471,16 @@ class Events extends \Zotlabs\Web\Controller {
'$sh_checked' => $sh_checked,
'$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))),
'$preview' => t('Preview'),
- '$permissions' => t('Permission settings'),
+ '$perms_label' => t('Permission settings'),
// populating the acl dialog was a permission description from view_stream because Cal.php, which
// displays events, says "since we don't currently have an event permission - use the stream permission"
'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))),
+
+ '$allow_cid' => acl2json($permissions['allow_cid']),
+ '$allow_gid' => acl2json($permissions['allow_gid']),
+ '$deny_cid' => acl2json($permissions['deny_cid']),
+ '$deny_gid' => acl2json($permissions['deny_gid']),
+
'$submit' => t('Submit'),
'$advanced' => t('Advanced Options')