Removed capability mod/forum:viewforum. We will use moodle/course:viewhiddenactivities and hide/unhide forums instead.

This commit is contained in:
vyshane 2006-09-21 08:32:05 +00:00
parent 986dc51c00
commit 9222e72167
4 changed files with 3 additions and 20 deletions

View File

@ -33,20 +33,6 @@
$mod_forum_capabilities = array(
'mod/forum:viewforum' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_MODULE,
'legacy' => array(
'guest' => CAP_ALLOW,
'student' => CAP_ALLOW,
'teacher' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW,
'coursecreator' => CAP_ALLOW,
'admin' => CAP_ALLOW
)
),
'mod/forum:viewdiscussion' => array(
'captype' => 'read',

View File

@ -93,7 +93,7 @@
$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
if (!has_capability('mod/forum:viewforum', $context)) {
if (!has_capability('mod/forum:viewdiscussions', $context)) {
if (isset($forum->keyreference)) {
unset($learningforums[$forum->keyreference]);
}

View File

@ -1183,8 +1183,7 @@ function forum_get_readable_forums($userid, $courseid=0) {
$forum->accessallgroups = true;
}
if (has_capability('mod/forum:viewforum', $forumcontext)
&& has_capability('mod/forum:viewdiscussion', $forumcontext)) {
if (has_capability('mod/forum:viewdiscussion', $forumcontext)) {
$forum->viewhiddentimedposts
= has_capability('mod/forum:viewhiddentimedposts', $forumcontext);
@ -4513,7 +4512,6 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(),
// Create overrides for default student and guest roles (prevent).
foreach ($studentroles as $studentrole) {
assign_capability('mod/forum:viewforum', CAP_PREVENT, $studentrole->id, $context->id);
assign_capability('mod/forum:viewdiscussion', CAP_PREVENT, $studentrole->id, $context->id);
assign_capability('mod/forum:viewhiddentimedposts', CAP_PREVENT, $studentrole->id, $context->id);
assign_capability('mod/forum:startdiscussion', CAP_PREVENT, $studentrole->id, $context->id);
@ -4533,7 +4531,6 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(),
assign_capability('mod/forum:throttlingapplies', CAP_PREVENT, $studentrole->id, $context->id);
}
foreach ($guestroles as $guestrole) {
assign_capability('mod/forum:viewforum', CAP_PREVENT, $guestrole->id, $context->id);
assign_capability('mod/forum:viewdiscussion', CAP_PREVENT, $guestrole->id, $context->id);
assign_capability('mod/forum:viewhiddentimedposts', CAP_PREVENT, $guestrole->id, $context->id);
assign_capability('mod/forum:startdiscussion', CAP_PREVENT, $guestrole->id, $context->id);

View File

@ -78,7 +78,7 @@
notice(get_string("activityiscurrentlyhidden"));
}
if (!has_capability('mod/forum:viewforum', $context)) {
if (!has_capability('mod/forum:viewdiscussions', $context)) {
notice(get_string('noviewdiscussionspermission', 'forum'));
}