diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-05 15:40:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-05 15:40:10 -0700 |
| commit | 9068ae68ad59249df92458626808673c96b174f1 (patch) | |
| tree | f45d6c8adc857f1df3bf368d0118fc83607eb91c /Zotlabs/Module/Chat.php | |
| parent | eeabf514eab20523b847c38cf5befb7f040b7d72 (diff) | |
| parent | 1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53 (diff) | |
| download | volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.tar.gz volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.tar.bz2 volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Chat.php')
| -rw-r--r-- | Zotlabs/Module/Chat.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index ff55a9319..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( @@ -234,12 +233,16 @@ class Chat extends \Zotlabs\Web\Controller { '$chat_expire' => array('chat_expire',t('Expiration of chats (minutes)'),120,''), '$permissions' => t('Permissions'), '$acl' => populate_acl($channel_acl,false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$submit' => t('Submit') )); } - + $rooms = Zlib\Chatroom::roomlist(\App::$profile['profile_uid']); $o .= replace_macros(get_markup_template('chatrooms.tpl'), array( |