mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-19 07:41:02 +01:00
Code Issues Projects Releases Wiki Activity

Merged from 1.7.

Browse Source
This commit is contained in:
vyshane 2007-02-09 01:33:24 +00:00
parent 20e0a8021d
commit 6527b5c2e9
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mod/forum/lib.php
View File

@ -1124,7 +1124,8 @@ function forum_get_readable_forums($userid, $courseid=0) {
$readableforums = array(); $readableforums = array();
foreach($courses as $course) { foreach ($courses as $course) {
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
if (has_capability('moodle/course:viewhiddenactivities', $coursecontext)) { if (has_capability('moodle/course:viewhiddenactivities', $coursecontext)) {
@ -1155,23 +1156,23 @@ function forum_get_readable_forums($userid, $courseid=0) {
foreach ($forums as $forum) { foreach ($forums as $forum) {
$forumcontext = get_context_instance(CONTEXT_MODULE, $forum->cmid); $forumcontext = get_context_instance(CONTEXT_MODULE, $forum->cmid);
// Evaluate groupmode.
$cm = new object;
$cm->id = $forum->cmid;
$cm->groupmode = $forum->cmgroupmode;
$forum->cmgroupmode = groupmode($course, $cm);
if ($forum->cmgroupmode == SEPARATEGROUPS
&& !has_capability('moodle/site:accessallgroups', $forumcontext)) {
$forum->accessallgroups = false;
$forum->accessgroup = $group->id; // The user can only access
// discussions for this group.
} else {
$forum->accessallgroups = true;
}
if (has_capability('mod/forum:viewdiscussion', $forumcontext)) { if (has_capability('mod/forum:viewdiscussion', $forumcontext)) {
// Evaluate groupmode.
$cm = new object;
$cm->id = $forum->cmid;
$cm->groupmode = $forum->cmgroupmode;
$forum->cmgroupmode = groupmode($course, $cm);
if ($forum->cmgroupmode == SEPARATEGROUPS
&& !has_capability('moodle/site:accessallgroups', $forumcontext)) {
$forum->accessallgroups = false;
$forum->accessgroup = $group->id; // The user can only access
// discussions for this group.
} else {
$forum->accessallgroups = true;
}
$forum->viewhiddentimedposts $forum->viewhiddentimedposts
= has_capability('mod/forum:viewhiddentimedposts', $forumcontext); = has_capability('mod/forum:viewhiddentimedposts', $forumcontext);
@ -3126,9 +3127,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
/// and the current user is a guest. /// and the current user is a guest.
// TODO: Add group mode in there, to test for visible group. // TODO: Add group mode in there, to test for visible group.
if (forum_user_can_post_discussion($forum, $currentgroup, $groupmode) if (forum_user_can_post_discussion($forum, $currentgroup, $groupmode)) {
|| (has_capability('moodle/legacy:guest', $context, NULL, false)
&& $course->id != SITEID)) {
echo '<div class="singlebutton forumaddnew">'; echo '<div class="singlebutton forumaddnew">';
echo "<form id=\"newdiscussionform\" method=\"get\" action=\"$CFG->wwwroot/mod/forum/post.php\">"; echo "<form id=\"newdiscussionform\" method=\"get\" action=\"$CFG->wwwroot/mod/forum/post.php\">";