mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

mod-forum MDL-24569 Improved forum posts/discussions links within navigation

Browse Source
This commit is contained in:
Sam Hemelryk 2010-10-11 06:28:41 +00:00
parent 68bf577bdf
commit 241ce9c4b4
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/navigationlib.php
View File

@ -1568,16 +1568,10 @@ class global_navigation extends navigation_node {
}
// Add nodes for forum posts and discussions if the user can view either or both
$canviewposts = has_capability('moodle/user:readuserposts', $usercontext);
$canviewdiscussions = has_capability('mod/forum:viewdiscussion', $coursecontext);
if ($canviewposts || $canviewdiscussions) {
if ($iscurrentuser || has_capability('moodle/user:readuserposts', $usercontext)) {
$forumtab = $usernode->add(get_string('forumposts', 'forum'));
if ($canviewposts) {
$forumtab->add(get_string('posts', 'forum'), new moodle_url('/mod/forum/user.php', $baseargs));
}
if ($canviewdiscussions) {
$forumtab->add(get_string('discussions', 'forum'), new moodle_url('/mod/forum/user.php', array_merge($baseargs, array('mode'=>'discussions', 'course'=>$course->id))));
}
$forumtab->add(get_string('posts', 'forum'), new moodle_url('/mod/forum/user.php', $baseargs));
$forumtab->add(get_string('discussions', 'forum'), new moodle_url('/mod/forum/user.php', array_merge($baseargs, array('mode'=>'discussions'))));
}
// Add blog nodes

30
mod/forum/user.php
View File

@ -34,33 +34,26 @@ $mode = optional_param('mode', 'posts', PARAM_ALPHA);
$page = optional_param('page', 0, PARAM_INT);
$perpage = optional_param('perpage', 5, PARAM_INT);
$url = new moodle_url('/mod/forum/user.php', array('course'=>$course));
$url = new moodle_url('/mod/forum/user.php');
if ($course !== SITEID) {
$url->param('course', $course);
}
if ($id !== 0) {
$url->param('id', $id);
}
if ($mode !== 'posts') {
$url->param('mode', $mode);
}
if ($page !== 0) {
$url->param('page', $page);
}
if ($perpage !== 5) {
$url->param('perpage', $perpage);
}
$PAGE->set_url($url);
$PAGE->set_pagelayout('standard');
if (empty($id)) { // See your own profile by default
require_login();
$id = $USER->id;
}
if (! $user = $DB->get_record("user", array("id" => $id))) {
print_error('invaliduserid');
}
if (! $course = $DB->get_record("course", array("id" => $course))) {
print_error('invalidcourseid');
}
$user = $DB->get_record("user", array("id" => $id), '*', MUST_EXIST);
$course = $DB->get_record("course", array("id" => $course), '*', MUST_EXIST);
$syscontext = get_context_instance(CONTEXT_SYSTEM);
$usercontext = get_context_instance(CONTEXT_USER, $id);
@ -68,6 +61,8 @@ $usercontext = get_context_instance(CONTEXT_USER, $id);
// do not force parents to enrol
if (!$DB->get_record('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id))) {
require_course_login($course);
} else {
$PAGE->set_course($course);
}
if ($user->deleted) {
@ -123,8 +118,7 @@ if ($course->id == SITEID) {
}
// Get the posts.
if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage,
$totalcount, $extrasql)) {
if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage, $totalcount, $extrasql)) {
$baseurl = new moodle_url('user.php', array('id' => $user->id, 'course' => $course->id, 'mode' => $mode, 'perpage' => $perpage));
echo $OUTPUT->paging_bar($totalcount, $page, $perpage, $baseurl);
@ -165,9 +159,7 @@ if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $pe
}
if (!isset($cms[$forum->id])) {
if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) {
print_error('invalidcoursemodule');
}
$cm = get_coursemodule_from_instance('forum', $forum->id, 0, false, MUST_EXIST);
$cms[$forum->id] = $cm;
unset($cm); // do not use cm directly, it would break caching
}