From: skodak Date: Mon, 14 Apr 2008 12:04:34 +0000 (+0000) Subject: MDL-13004 post ratings in user profile page; merged from MOODLE_19_STABLE X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2011a95b4488a9694e3fedd612949a883faba5bb;p=moodle.git MDL-13004 post ratings in user profile page; merged from MOODLE_19_STABLE --- diff --git a/mod/forum/user.php b/mod/forum/user.php index 3362310c51..f16f3ef0ef 100644 --- a/mod/forum/user.php +++ b/mod/forum/user.php @@ -17,22 +17,22 @@ } if (! $user = get_record("user", "id", $id)) { - print_error("User ID is incorrect"); + error("User ID is incorrect"); } if (! $course = get_record("course", "id", $course)) { - print_error("Course id is incorrect."); + error("Course id is incorrect."); } $syscontext = get_context_instance(CONTEXT_SYSTEM); $usercontext = get_context_instance(CONTEXT_USER, $id); - + // do not force parents to enrol if (!get_record('role_assignments', 'userid', $USER->id, 'contextid', $usercontext->id)) { require_course_login($course); } - add_to_log($course->id, "forum", "user report", "user.php?id=$course->id&user=$user->id&mode=$mode", "$user->id"); + add_to_log($course->id, "forum", "user report", "user.php?id=$course->id&user=$user->id&mode=$mode", "$user->id"); $strforumposts = get_string('forumposts', 'forum'); $strparticipants = get_string('participants'); @@ -46,11 +46,11 @@ $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id", 'type' => 'title'); $navlinks[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title'); $navlinks[] = array('name' => $strmode, 'link' => '', 'type' => 'title'); - + $navigation = build_navigation($navlinks); - + print_header("$course->shortname: $fullname: $strmode", $course->fullname,$navigation); - + $currenttab = $mode; $showroles = 1; @@ -68,9 +68,9 @@ $extrasql = 'AND p.parent = 0'; break; } - + echo '
'; - + if ($course->id == SITEID) { if (empty($CFG->forceloginforprofiles) || isloggedin()) { // Search throughout the whole site. @@ -82,23 +82,23 @@ // Search only for posts the user made in this course. $searchcourse = $course->id; } - + // Get the posts. - if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage, + if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage, $totalcount, $extrasql)) { - - print_paging_bar($totalcount, $page, $perpage, + + print_paging_bar($totalcount, $page, $perpage, "user.php?id=$user->id&course=$course->id&mode=$mode&perpage=$perpage&"); $discussions = array(); $forums = array(); $cms = array(); - + foreach ($posts as $post) { if (!isset($discussions[$post->discussion])) { if (! $discussion = get_record('forum_discussions', 'id', $post->discussion)) { - print_error('Discussion ID was incorrect'); + error('Discussion ID was incorrect'); } $discussions[$post->discussion] = $discussion; } else { @@ -107,16 +107,27 @@ if (!isset($forums[$discussion->forum])) { if (! $forum = get_record('forum', 'id', $discussion->forum)) { - print_error("Could not find forum $discussion->forum"); + error("Could not find forum $discussion->forum"); } $forums[$discussion->forum] = $forum; } else { $forum = $forums[$discussion->forum]; } + $ratings = null; + if ($forum->assessed) { + if ($scale = make_grades_menu($forum->scale)) { + $ratings =new object(); + $ratings->scale = $scale; + $ratings->assesstimestart = $forum->assesstimestart; + $ratings->assesstimefinish = $forum->assesstimefinish; + $ratings->allow = false; + } + } + if (!isset($cms[$forum->id])) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) { - print_error('Course Module ID was incorrect'); + error('Course Module ID was incorrect'); } $cms[$forum->id] = $cm; unset($cm); // do not use cm directly, it would break caching @@ -129,7 +140,7 @@ $fullsubject .= " -> discussion&parent=$post->id\">".format_string($post->subject,true).""; } } - + if ($course->id == SITEID && has_capability('moodle/site:config', $syscontext)) { $postcoursename = get_field('course', 'shortname', 'id', $forum->course); $fullsubject = ''.$postcoursename.' -> '. $fullsubject; @@ -140,11 +151,11 @@ $fulllink = "discussion#p$post->id\">". get_string("postincontext", "forum").""; - forum_print_post($post, $discussion, $forum, $cms[$forum->id], $course, false, false, false, false, $fulllink); + forum_print_post($post, $discussion, $forum, $cms[$forum->id], $course, false, false, false, $ratings, $fulllink); echo "
"; } - - print_paging_bar($totalcount, $page, $perpage, + + print_paging_bar($totalcount, $page, $perpage, "user.php?id=$user->id&course=$course->id&mode=$mode&perpage=$perpage&"); } else { if ($mode == 'posts') {