mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:55:19 +00:00
Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
1ca85abf83
2 changed files with 7 additions and 5 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue