changes to how to pull out a list of users (course/module participants)

diff --git a/lib/accesslib.php b/lib/accesslib.php
index a08fb2795e3a2f877cde5fa02934cfbb61ac9be6..7935e4cbd6e1c6446ec8f67d2a9e38a1f518f1aa 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1407,7 +1407,7 @@ function fetch_context_capabilities($context) {
  * @param int $roleid
  * @return array
  */
-function role_context_capabilities($roleid, $context) {
+function role_context_capabilities($roleid, $context, $cap='') {
     global $CFG; 
     
     $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
@@ -1419,14 +1419,19 @@ function role_context_capabilities($roleid, $context) {
     $contexts = array_reverse(get_parent_contexts($context));
     $contexts = '('.implode(',', $contexts).')';
     
+    if ($cap) {
+        $search = ' AND rc.capability = "'.$cap.'" ';
+    } else {
+        $search = '';  
+    }
+    
     $SQL = "SELECT rc.* FROM {$CFG->prefix}role_capabilities rc, {$CFG->prefix}context c
             where rc.contextid in $contexts
             and rc.roleid = $roleid
-            and rc.contextid = c.id
+            and rc.contextid = c.id $search
             ORDER BY c.aggregatelevel DESC, rc.capability DESC";
-            
+  
     $records = get_records_sql($SQL);
-    
     $capabilities = array();
     
     // We are traversing via reverse order.
@@ -1790,4 +1795,45 @@ function get_overridable_roles ($context) {
     return $options;  
   
 }
+
+
+/**
+ * who has this capability in this context
+ * does not handling user level resolving!!!
+ * i.e 1 person has 2 roles 1 allow, 1 prevent, this will not work properly
+ * @param $context - object
+ * @param $capability - string capability
+ * @param $fields - fields to be pulled
+ * @param $sort - the sort order
+ */
+function get_users_by_capability($context, $capability, $fields='distinct u.*', $sort='') {
+    
+    global $CFG;
+    
+    // first get all roles with this capability in this context, or above
+    $possibleroles = get_roles_with_capability($capability, CAP_ALLOW);
+    $validroleids = array();
+    foreach ($possibleroles as $prole) {
+        $caps = role_context_capabilities($prole->id, $context, $capability); // resolved list
+        if ($caps[$capability] > 0) { // resolved capability > 0
+            $validroleids[] = $prole->id;
+        }
+    }
+    
+    if ($usercontexts = get_parent_contexts($context)) {
+        $listofcontexts = '('.implode(',', $usercontexts).')';
+    } else {
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $listofcontexts = '('.$sitecontext->id.')'; // must be site  
+    }
+    
+    $roleids =  '('.implode(',', $validroleids).')';
+    
+    $select = ' SELECT '.$fields;
+    $from   = ' FROM '.$CFG->prefix.'user u LEFT JOIN '.$CFG->prefix.'role_assignments ra ON ra.userid = u.id ';
+    $where  = ' WHERE (ra.contextid = '.$context->id.' OR ra.contextid in '.$listofcontexts.') AND u.deleted = 0 AND ra.roleid in '.$roleids.' ';    
+
+    return get_records_sql($select.$from.$where);  
+
+}
 ?>

diff --git a/mod/assignment/details.php b/mod/assignment/details.php
index fb0807021ddf84b8fde0b876febc510cc24ef672..6559d7b74a21896e64c3167ac708cee61381910a 100644 (file)
--- a/mod/assignment/details.php
+++ b/mod/assignment/details.php
@@ -15,7 +15,7 @@
 
     require_login($course->id);
 
-    if (!isteacheredit($course->id)) {
+    if (!has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $form->course))) {
         redirect($CFG->wwwroot.'/course/view.php?id='.$course->id);
     }
 

diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index 1468c4c33cf923420234865ba31acf67c6a5b9a4..660ad8b2fa9a58d5f35ae50d8c31a9a30e8a39e8 100644 (file)
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -44,7 +44,7 @@
     }
 
     $currentgroup = get_current_group($course->id);
-    if ($currentgroup and isteacheredit($course->id)) {
+    if ($currentgroup and has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_COURSE, $id))) {
         $group = get_record("groups", "id", $currentgroup);
         $groupname = " ($group->name)";
     } else {

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index c17ce77dc9cb10bd3e8d3e56c3abd60a61da55db..da8863444231eb549dce736adabd3ef38e315ef2 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -277,11 +277,11 @@ class assignment_base {
         $submitted = '';
 
         $context = get_context_instance(CONTEXT_MODULE,$this->cm->id);
-        if (has_capability('mod/assignment:grade', $context) && (groupmode($this->course, $this->cm) == SEPARATEGROUPS)) {
+        if (has_capability('mod/assignment:grade', $context)) {
 
         // if this user can mark and is put in a group
         // then he can only see/mark submission in his own groups
-            if (user_group($this->course->id, $USER->id)) {             
+            if (!has_capability('moodle/course:managegroups', $context) and (groupmode($this->course, $this->cm) == SEPARATEGROUPS)) {
                 $count = $this->count_real_submissions($this->currentgroup);  // Only their groups
             } else {
                 $count = $this->count_real_submissions();                     // Everyone
@@ -571,7 +571,7 @@ class assignment_base {
                 $this->display_submission();
                 break;
 
-            case 'all':                           // Main window, display everything
+            case 'all':                          // Main window, display everything
                 $this->display_submissions();
                 break;
 
@@ -1012,7 +1012,8 @@ class assignment_base {
         if ($currentgroup) {
             $users = get_group_users($currentgroup);
         } else {
-            $users = get_course_users($course->id);
+            $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+            $users = get_users_by_capability($context, 'mod/assignment:submit'); // everyone with this capability set to non-prohibit
         }
 
         $tablecolumns = array('picture', 'fullname', 'grade', 'comment', 'timemodified', 'timemarked', 'status');
@@ -2158,16 +2159,22 @@ function assignment_count_real_submissions($assignment, $groupid=0) {
                                       AND g.groupid = '$groupid' 
                                       AND a.userid = g.userid ");
     } else {
-        $select = "s.course = '$assignment->course' AND";
-        if ($assignment->course == SITEID) {
-            $select = '';
+        $cm = get_coursemodule_from_instance('assignment', $assignment->id);
+        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        
+        // this is all the users with this capability set, in this context or higher
+        $users = get_users_by_capability($context, 'mod/assignment:submit');
+        foreach ($users as $user) {
+            $array[] = $user->id;
         }
+        
+        $userlists = '('.implode(',',$array).')';
+                                   
         return count_records_sql("SELECT COUNT(*)
-                                  FROM {$CFG->prefix}assignment_submissions a, 
-                                       {$CFG->prefix}user_students s
-                                 WHERE a.assignment = '$assignment->id' 
-                                   AND a.timemodified > 0
-                                   AND $select a.userid = s.userid ");
+                                  FROM {$CFG->prefix}assignment_submissions
+                                 WHERE assignment = '$assignment->id' 
+                                   AND timemodified > 0
+                                   AND userid IN $userlists ");
     }
 }
 

diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index 1256b29945fabda88acf701b43fd17ab934a1728..79e0caf594a33a6fd91fbd486981ec6229258c49 100644 (file)
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -33,9 +33,7 @@
 
     require_login($course->id, false, $cm);
 
-    if (!isteacher($course->id)) {
-        error("Only teachers can look at this page");
-    }
+    require_capability('mod/assignment:grade', get_context_instance(CONTEXT_MODULE, $cm->id));
 
 /// Load up the required assignment code
     require($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php');

diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index d2a9a25d6a31b0b5a0a85d4e20415244aa33b12f..ff8bbec4029fdf6ff6ac4f1773e1dbbbdb78b847 100644 (file)
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -18,7 +18,7 @@ class assignment_online extends assignment_base {
         require_capability('mod/assignment:view', $context);
         
                $submission = $this->get_submission();
-        
+
         //Guest can not submit nor edit an assignment (bug: 4604)
         if (isguest($USER->id)) {
             $editable = null;