aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-13 08:43:20 +1100
committerfriendica <info@friendica.com>2014-02-13 08:43:20 +1100
commita14df3ab72e58ea9d60ef79edf66b51cb3107f46 (patch)
treed1b12935e871b46052574f0ea2a38e133ab45b7b
parente47035f85a680344f2d5f58971ca2629c70c7838 (diff)
parent18b2ff9c24d2384f57009d86cab9a3a82d3dc7b8 (diff)
downloadvolse-hubzilla-a14df3ab72e58ea9d60ef79edf66b51cb3107f46.tar.gz
volse-hubzilla-a14df3ab72e58ea9d60ef79edf66b51cb3107f46.tar.bz2
volse-hubzilla-a14df3ab72e58ea9d60ef79edf66b51cb3107f46.zip
Merge pull request #311 from git-marijus/master
make chatrooms in /chat/channel visible to observers aswell
-rw-r--r--include/chat.php6
-rw-r--r--include/widgets.php6
2 files changed, 7 insertions, 5 deletions
diff --git a/include/chat.php b/include/chat.php
index fb1d4fe65..5a17230e0 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -173,10 +173,12 @@ function chatroom_leave($observer_xchan,$room_id,$client) {
function chatroom_list($uid) {
+ require_once('include/security.php');
+ $sql_extra = permissions_sql($uid);
- $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d group by cr_name order by cr_name",
+ $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name order by cr_name",
intval($uid)
);
return $r;
-} \ No newline at end of file
+}
diff --git a/include/widgets.php b/include/widgets.php
index 0151f7c27..3c2333323 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -578,13 +578,13 @@ function widget_menu_preview($arr) {
}
function widget_chatroom_list($arr) {
+ $a = get_app();
require_once("include/chat.php");
- $r = chatroom_list(local_user());
- $channel = get_app()->get_channel();
+ $r = chatroom_list($a->profile['profile_uid']);
return replace_macros(get_markup_template('chatroomlist.tpl'),array(
'$header' => t('Chat Rooms'),
'$baseurl' => z_root(),
- '$nickname' => $channel['channel_address'],
+ '$nickname' => $a->profile['channel_address'],
'$items' => $r,
));
}