Replaced capability mod/forum:viewdiscussionsfromallgroups by

moodle/site:accessallgroups in code. Removed former from mod/forum/db/access.php.

diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php
index 30bde125214961de95e7731c1b99537229552070..ce6709f2e7d891357b7c9a3e1b37a7addcf78c5e 100644 (file)
--- a/mod/forum/db/access.php
+++ b/mod/forum/db/access.php
@@ -61,20 +61,6 @@ $mod_forum_capabilities = array(
         )
     ),
     
-    'mod/forum:viewdiscussionsfromallgroups' => array(
-    
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_MODULE,
-        'legacy' => array(
-            'guest' => CAP_PREVENT,
-            'student' => CAP_PREVENT,
-            'teacher' => CAP_PREVENT,
-            'editingteacher' => CAP_ALLOW,
-            'coursecreator' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    
     'mod/forum:startdiscussion' => array(
     
         'captype' => 'read',

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index bc49021589e644124ba3d2774e736442f910361e..9cfab74d5efc9cb1b8d206d5ca97200165c9607d 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -31,8 +31,8 @@
     
     $canviewdiscussion = false;
 
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-    if (has_capability('mod/forum:viewdiscussion', $context->id)) {
+    $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    if (has_capability('mod/forum:viewdiscussion', $modcontext->id)) {
         $canviewdiscussion = true;
     }
 
@@ -53,7 +53,7 @@
 
 
     if (!empty($move)) {
-        if (has_capability('mod/forum:movediscussions', $context->id)) {
+        if (has_capability('mod/forum:movediscussions', $modcontext->id)) {
             error("You do not have the permission to move this discussion!");
         }
         if ($forum = get_record("forum", "id", $move)) {
@@ -155,7 +155,7 @@
 
                                        
     
-    if ($groupmode and !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) {   // Groups must be kept separate
+    if ($groupmode and !has_capability('moodle/site:accessallgroups', $modcontext->id)) {   // Groups must be kept separate
         //change this to ismember
         $mygroupid = mygroupid($course->id); //only useful if 0, otherwise it's an array now
         if ($groupmode == SEPARATEGROUPS) {
@@ -174,7 +174,7 @@
         } else if ($groupmode == VISIBLEGROUPS) {
             $canreply = ( (empty($mygroupid) && $discussion->groupid == -1) ||
                     (ismember($discussion->groupid) || $mygroupid == $discussion->groupid) &&
-                    has_capability('mod/forum:replypost', $context->id) );
+                    has_capability('mod/forum:replypost', $modcontext->id) );
         }
     }
 
@@ -184,7 +184,7 @@
 
     echo '<table width="100%"><tr><td width="33%">';
 
-    if ($groupmode == VISIBLEGROUPS or ($groupmode and has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id))) {
+    if ($groupmode == VISIBLEGROUPS or ($groupmode and has_capability('moodle/site:accessallgroups', $modcontext->id))) {
         if ($groups = get_records_menu('groups', 'courseid', $course->id, 'name ASC', 'id,name')) {
             print_group_menu($groups, $groupmode, $discussion->groupid, "view.php?id=$cm->id&amp;group=");
         }
@@ -194,7 +194,7 @@
     forum_print_mode_form($discussion->id, $displaymode);
 
     echo "</td><td width=\"33%\">";
-    if (has_capability('mod/forum:movediscussions', $context->id)) { // Popup menu to move discussions to other forums
+    if (has_capability('mod/forum:movediscussions', $modcontext->id)) { // Popup menu to move discussions to other forums
         if ($forums = get_all_instances_in_course("forum", $course)) {
             if ($course->format == 'weeks') {
                 $strsection = get_string("week");
@@ -228,7 +228,7 @@
         notify(get_string('thisforumisthrottled','forum',$a));
     }
 
-    if ($forum->type == 'qanda' && !has_capability('mod/forum:viewqandawithoutposting', $context->id) &&
+    if ($forum->type == 'qanda' && !has_capability('mod/forum:viewqandawithoutposting', $modcontext->id) &&
                 !forum_user_has_posted($forum->id,$discussion->id,$USER->id)) {
         notify(get_string('qandanotify','forum'));
     }
@@ -238,7 +238,7 @@
     }
 
 /// Print the actual discussion
-    $canrate = has_capability('mod/forum:rate', $context->id);
+    $canrate = has_capability('mod/forum:rate', $modcontext->id);
     forum_print_discussion($course, $forum, $discussion, $post, $displaymode, $canreply, $canrate);
 
     print_footer($course);

diff --git a/mod/forum/index.php b/mod/forum/index.php
index 87c5f3029191729406c6f6dbe734865c3ee82e59..aa6a0834e7baedb426b41bb1310e3650f1b12f66 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -169,7 +169,7 @@
 
 
             // this is potentially wrong logic. could possibly check for if user has the right to hmmm
-            if ($groupmode == SEPARATEGROUPS and !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) {
+            if ($groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context->id)) {
                 $count = count_records_select("forum_discussions", "forum = '$forum->id' AND (groupid = '$currentgroup' OR groupid = '-1')");
             } else {
                 $count = count_records("forum_discussions", "forum", "$forum->id");
@@ -177,7 +177,7 @@
 
             if ($usetracking) {
                 if (($forum->trackingtype == FORUM_TRACKING_ON) || !isset($untracked[$forum->id])) {
-                    $groupid = ($groupmode==SEPARATEGROUPS && !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) ? $currentgroup : false;
+                    $groupid = ($groupmode==SEPARATEGROUPS && !has_capability('moodle/site:accessallgroups', $context->id)) ? $currentgroup : false;
                     $unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid);
                     if ($unread > 0) {
                         $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
@@ -237,7 +237,7 @@
                 if (forum_is_forcesubscribed($forum->id)) {
                     $sublink = $stryes;
                 } else {
-                    if ($groupmode and !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id) and !mygroupid($course->id)) {
+                    if ($groupmode and !has_capability('moodle/site:accessallgroups', $context->id) and !mygroupid($course->id)) {
                         $sublink = $strno;   // Can't subscribe to a group forum (not in a group)
                         $forumlink = format_string($forum->name,true);
                     } else {
@@ -319,7 +319,7 @@
                 $forum->visible = instance_is_visible("forum", $forum);
                 $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
  
-                if ($groupmode == SEPARATEGROUPS and !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) {
+                if ($groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context->id)) {
                     $count = count_records("forum_discussions", "forum", "$forum->id", "groupid", $currentgroup);
                 } else {
                     $count = count_records("forum_discussions", "forum", "$forum->id");

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index efed997457edf09d6a65c564060e40babde7773e..76e0e0ef2276ae2e058fd638533f7a223072339a 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1107,7 +1107,7 @@ function forum_get_child_posts($parent, $forumid) {
  * @param $groupid - either a single groupid or an array of groupids.
  *                   this specifies the groups the search is to be carried
  *                   for. However, please note that, unless the user has
- *                   the capability 'mod/forum:viewdiscussionsfromallgroups',
+ *                   the capability 'moodle/site:accessallgroups',
  *                   we will restrict the search to a subset of groups from 
  *                   $groupid. The subset consists of the groups the user
  *                   really is in.
@@ -1137,7 +1137,7 @@ function forum_search_posts($searchterms, $courseid, $page=0, $recordsperpage=50
     }
     
     // Take into account user groups.
-    if (has_capability('mod/forum:viewdiscussionsfromallgroups', $modcontext->id)) {
+    if (has_capability('moodle/site:accessallgroups', $modcontext->id)) {
         $selectgroup = '';
         $coursetable = '';
         
@@ -2779,7 +2779,7 @@ function forum_user_can_post_discussion($forum, $currentgroup=false, $groupmode=
     if ($forum->type == "eachuser") {
         return (!forum_user_has_posted_discussion($forum->id, $USER->id));
     } else if ($currentgroup) {
-        return (has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)
+        return (has_capability('moodle/site:accessallgroups', $context->id)
                 or (ismember($currentgroup) and $forum->open == 2));
     } else {
         //else it might be group 0 in visible mode
@@ -2844,7 +2844,7 @@ function forum_user_can_view_post($post, $course, $cm, $forum, $discussion, $use
     if ($discussion->groupid > 0) {
         if ($cm->groupmode == SEPARATEGROUPS) {
             return ismember($discussion->groupid) ||
-                    has_capability('mod/forum:viewdiscussionsfromallgroups', $modcontext->id);
+                    has_capability('moodle/site:accessallgroups', $modcontext->id);
         }
     }
     return true;
@@ -2983,7 +2983,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
     }
 
     if (!$currentgroup and ($groupmode != SEPARATEGROUPS or 
-                has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) ) {
+                has_capability('moodle/site:accessallgroups', $context->id)) ) {
         $visiblegroups = -1;
     } else {
         $visiblegroups = $currentgroup;

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 3b2aeaf662e62e7d24890805fc1390df8fa2d736..d31219f87c7003a5ac0e7a2ed8982021146b319c 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -21,7 +21,7 @@
         
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
         if (groupmode($course, $cm) and
-                    !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) {
+                    !has_capability('moodle/site:accessallgroups', $context->id)) {
             if (!mygroupid($course->id)) {
                 error('Sorry, but you must be a group member to subscribe.');
             }

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 751da36bbf218409669fe5da607eaf0685f56470..94c1942248c648daa22352983731fcd43fe1c91b 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -95,7 +95,7 @@
     $currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
     
     if ($groupmode and ($currentgroup === false) and
-            !has_capability('mod/forum:viewdiscussionsfromallgroups', $context->id)) {
+            !has_capability('moodle/site:accessallgroups', $context->id)) {
         
         print_heading(get_string("notingroup", "forum"));
         print_footer($course);
@@ -114,7 +114,7 @@
 
     //now we need a menu for separategroups as well!
     if ($groupmode == VISIBLEGROUPS or ($groupmode and
-            has_capability('module:forum:viewdiscussionsfromallgroups', $context->id))) {
+            has_capability('moodle/site:accessallgroups', $context->id))) {
         
         //the following query really needs to change
         if ($groups = get_records_menu("groups", "courseid", $course->id, "name ASC", "id,name")) {