From fdff1f63a32cf93fc4d4d0cb58d3945d847fedd5 Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 8 Apr 2004 15:12:35 +0000 Subject: [PATCH] Fixes when displaying lists of users in group mode --- mod/chat/gui_header_js/index.php | 4 ++-- mod/chat/lib.php | 3 ++- mod/chat/users.php | 2 +- mod/chat/view.php | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mod/chat/gui_header_js/index.php b/mod/chat/gui_header_js/index.php index 32b55b6c5e..82e69f2bfe 100644 --- a/mod/chat/gui_header_js/index.php +++ b/mod/chat/gui_header_js/index.php @@ -4,7 +4,7 @@ require_once('../lib.php'); require_variable($id); - optional_variable($groupid); + optional_variable($groupid, -1); if (!$chat = get_record("chat", "id", $id)) { error("Could not find that chat room!"); @@ -39,7 +39,7 @@ $groupname = ''; } - if (!$chat_sid = chat_login_user($chat->id, "header_js")) { + if (!$chat_sid = chat_login_user($chat->id, "header_js", $currentgroup)) { error("Could not log in to chat room!!"); } diff --git a/mod/chat/lib.php b/mod/chat/lib.php index c6a77bb5d8..ed2ec9cfc1 100644 --- a/mod/chat/lib.php +++ b/mod/chat/lib.php @@ -239,11 +239,12 @@ function chat_get_latest_message($chatid, $groupid=0) { ////////////////////////////////////////////////////////////////////// -function chat_login_user($chatid, $version="header_js") { +function chat_login_user($chatid, $version="header_js", $groupid=0) { global $USER; $chatuser->chatid = $chatid; $chatuser->userid = $USER->id; + $chatuser->groupid = $groupid; $chatuser->version = $version; $chatuser->ip = $USER->lastIP; $chatuser->lastping = $chatuser->firstping = $chatuser->lastmessageping = time(); diff --git a/mod/chat/users.php b/mod/chat/users.php index 5f9088c1e6..bf65c944c0 100644 --- a/mod/chat/users.php +++ b/mod/chat/users.php @@ -64,7 +64,7 @@ header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); header("Cache-Control: no-cache, must-revalidate"); header("Pragma: no-cache"); header("Content-Type: text/html"); -header("Refresh: $CFG->chat_refresh_userlist; URL=users.php?chat_sid=$chat_sid"); +header("Refresh: $CFG->chat_refresh_userlist; URL=users.php?chat_sid=$chat_sid&groupid=$groupid"); print_header(); diff --git a/mod/chat/view.php b/mod/chat/view.php index f457c0dc12..e137d915b8 100644 --- a/mod/chat/view.php +++ b/mod/chat/view.php @@ -75,7 +75,7 @@ if ($currentgroup) { $groupselect = " AND groupid = '$currentgroup'"; - $groupparam = "&group=$currentgroup"; + $groupparam = "&groupid=$currentgroup"; } else { $groupselect = ""; $groupparam = ""; -- 2.39.5