aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Events.php
diff options
context:
space:
mode:
authorTreer <treer.git@the-bordello.com>2016-05-08 21:27:52 +1000
committerTreer <treer.git@the-bordello.com>2016-05-08 21:27:52 +1000
commit09ef30feb0e6f38ee3de34a37270cf796850b3d4 (patch)
tree0c3ef6ae7bd82e2b7337d8cb4b336faee89b7d59 /Zotlabs/Module/Events.php
parente7a65c1f8d97b92e311beb064a7094216e23b119 (diff)
downloadvolse-hubzilla-09ef30feb0e6f38ee3de34a37270cf796850b3d4.tar.gz
volse-hubzilla-09ef30feb0e6f38ee3de34a37270cf796850b3d4.tar.bz2
volse-hubzilla-09ef30feb0e6f38ee3de34a37270cf796850b3d4.zip
Update some modules to use new ACL dialog feature
Diffstat (limited to 'Zotlabs/Module/Events.php')
-rw-r--r--Zotlabs/Module/Events.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index a14e320b2..9519ca11b 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -6,6 +6,7 @@ require_once('include/bbcode.php');
require_once('include/datetime.php');
require_once('include/event.php');
require_once('include/items.php');
+require_once('include/PermissionDescription.php');
class Events extends \Zotlabs\Web\Controller {
@@ -237,7 +238,7 @@ class Events extends \Zotlabs\Web\Controller {
- function get() {
+ function get() {
if(argc() > 2 && argv(1) == 'ical') {
$event_id = argv(2);
@@ -468,7 +469,9 @@ class Events extends \Zotlabs\Web\Controller {
'$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))),
'$preview' => t('Preview'),
'$permissions' => t('Permission settings'),
- '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)),
+ // 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, \PermissionDescription::fromGlobalPermission('view_stream'))),
'$submit' => t('Submit'),
'$advanced' => t('Advanced Options')