From 80aede31d393fa41d97487ae012f57fbef895581 Mon Sep 17 00:00:00 2001 From: skodak Date: Tue, 31 Oct 2006 21:07:00 +0000 Subject: [PATCH] fixed capabilities in chat recent activity, removed broken optimization from message insert, fixed closing of box MDL-7313; merged from MOODLE_17_STABLE --- mod/chat/gui_header_js/insert.php | 2 +- mod/chat/lib.php | 9 ++------- mod/chat/report.php | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mod/chat/gui_header_js/insert.php b/mod/chat/gui_header_js/insert.php index 799d6842c78..6972bcc4a73 100644 --- a/mod/chat/gui_header_js/insert.php +++ b/mod/chat/gui_header_js/insert.php @@ -14,7 +14,7 @@ error('No chat found'); } - if (!$course = get_record('course', 'id', $chat->course, '', '', '','', 'id, shortname')) { + if (!$course = get_record('course', 'id', $chat->course)) { error('Could not find the course this belongs to!'); } diff --git a/mod/chat/lib.php b/mod/chat/lib.php index 7ca4f942b86..d69c9510dc2 100644 --- a/mod/chat/lib.php +++ b/mod/chat/lib.php @@ -199,12 +199,7 @@ function chat_print_recent_activity($course, $isteacher, $timestart) { if ($chat = get_record('chat', 'id', $chatuser->chatid)) { // we find the course module id - $chatmod = get_record('modules', 'name', 'chat'); - $SQL = "select * from {$CFG->prefix}course_modules where - course = $course->id - and module = $chatmod->id - and instance = $chat->id"; - $cm = get_records_sql($SQL); + $cm = get_coursemodule_from_instance('chat', $chat->id, $course->id); $context = get_context_instance(CONTEXT_MODULE, $cm->id); // needs to be fixed @@ -219,7 +214,7 @@ function chat_print_recent_activity($course, $isteacher, $timestart) { } $current = $chatuser->chatid; } - $fullname = fullname($chatuser, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_MODULE, $cm->id))); + $fullname = fullname($chatuser, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id))); echo '
  • '.$fullname.'
  • '; } diff --git a/mod/chat/report.php b/mod/chat/report.php index 02faa08c1cd..82af7f1ed42 100644 --- a/mod/chat/report.php +++ b/mod/chat/report.php @@ -79,7 +79,7 @@ echo $formatmessage->html; } } - print_simple_box_end('center'); + print_simple_box_end(); } if (!$deletesession or !has_capability('mod/chat:deletelog', $context)) {