aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-05 13:20:03 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-05 13:20:03 +0200
commitbed0a5773fe2300979969b46ef633f28ab84bf43 (patch)
tree08052e59515bfdd70dac6693da3dc78debd7fe77 /Zotlabs/Module
parent53a2262fef2c1e6208a301a15c0e0c9a024b2b42 (diff)
downloadvolse-hubzilla-bed0a5773fe2300979969b46ef633f28ab84bf43.tar.gz
volse-hubzilla-bed0a5773fe2300979969b46ef633f28ab84bf43.tar.bz2
volse-hubzilla-bed0a5773fe2300979969b46ef633f28ab84bf43.zip
multi acl: port /rpost
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Chat.php9
-rw-r--r--Zotlabs/Module/Rpost.php1
2 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php
index 69ab8000a..2c0e7a155 100644
--- a/Zotlabs/Module/Chat.php
+++ b/Zotlabs/Module/Chat.php
@@ -218,14 +218,13 @@ class Chat extends \Zotlabs\Web\Controller {
notice( t('Feature disabled.') . EOL);
return $o;
}
-
-
+
$acl = new \Zotlabs\Access\AccessList($channel);
$channel_acl = $acl->get();
-
+
$lockstate = (($channel_acl['allow_cid'] || $channel_acl['allow_gid'] || $channel_acl['deny_cid'] || $channel_acl['deny_gid']) ? 'lock' : 'unlock');
require_once('include/acl_selectors.php');
-
+
$chatroom_new = '';
if(local_channel()) {
$chatroom_new = replace_macros(get_markup_template('chatroom_new.tpl'),array(
@@ -243,7 +242,7 @@ class Chat extends \Zotlabs\Web\Controller {
));
}
-
+
$rooms = Zlib\Chatroom::roomlist(\App::$profile['profile_uid']);
$o .= replace_macros(get_markup_template('chatrooms.tpl'), array(
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
index 9e3043d10..525f053de 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -116,6 +116,7 @@ class Rpost extends \Zotlabs\Web\Controller {
'nickname' => $channel['channel_address'],
'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
'acl' => populate_acl($channel_acl, true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
+ 'permissions' => $channel_acl,
'bang' => '',
'visitor' => true,
'profile_uid' => local_channel(),