MDL-12122 Changed userid to PARAM_INT, and changed 'all' to 0

moodle · Jan 17, 2008 · 3983345 · 3983345
1 parent 047901c
commit 3983345
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/grade/lib.php b/grade/lib.php
@@ -131,18 +131,6 @@ function init() {
         }
         return true;
     }
-
-    /**
-     * Returns the number of graded users in the course. Needs to be called after init(), otherwise returns null.
-     * @return int Number of users in course
-     */
-    function users_count() {
-        if (method_exists($this->users_rs, 'RecordCount')) {
-            return $this->users_rs->RecordCount();
-        } else {
-            return null;
-        }
-    }
 
     /**
      * Returns information about the next user
@@ -256,8 +244,12 @@ function _pop() {
  * @param bool $return If true, will return the HTML, otherwise, will print directly
  * @return null
  */
-function print_graded_users_selector($course, $actionpage, $userid='all', $return=false) {
-    global $CFG;
+function print_graded_users_selector($course, $actionpage, $userid=null, $return=false) {
+    global $CFG, $USER;
+
+    if (is_null($userid)) {
+        $userid = $USER->id;
+    }
 
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
@@ -266,8 +258,8 @@ function print_graded_users_selector($course, $actionpage, $userid='all', $retur
     $gui = new graded_users_iterator($course);
     $gui->init();
 
-    if ($userid != 'all') {
-        $menu['all'] = get_string('allusers', 'grades') . ' (' . $gui->users_count() . ')';
+    if ($userid !== 0) {
+        $menu[0] = get_string('allusers', 'grades');
     }
 
     while ($userdata = $gui->next_user()) {
@@ -276,6 +268,10 @@ function print_graded_users_selector($course, $actionpage, $userid='all', $retur
     }
 
     $gui->close();
+
+    if ($userid !== 0) {
+        $menu[0] .= " (" . (count($menu) - 1) . ")";
+    }
 
     return popup_form($CFG->wwwroot.'/grade/' . $actionpage . '&amp;userid=', $menu, 'choosegradeduser', $userid, 'choose', '', '', 
                         $return, 'self', get_string('selectalloroneuser', 'grades')); 

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
@@ -28,7 +28,7 @@
 require_once $CFG->dirroot.'/grade/report/user/lib.php';
 
 $courseid = required_param('id');
-$userid   = optional_param('userid', $USER->id, PARAM_ALPHANUM);
+$userid   = optional_param('userid', $USER->id, PARAM_INT);
 
 /// basic access checks
 if (!$course = get_record('course', 'id', $courseid)) {
@@ -37,7 +37,7 @@
 require_login($course);
 
 
-if ($userid != 'all' && !$user = get_complete_user_data('id', $userid)) {
+if ($userid !== 0 && !$user = get_complete_user_data('id', $userid)) {
     error("Incorrect userid");
 }
 
@@ -93,7 +93,7 @@
         print_graded_users_selector($course, 'report/user/index.php?id=' . $course->id, $userid);
         echo '</div>';
 
-        if ($userid == 'all') {
+        if ($userid === 0) {
             $gui = new graded_users_iterator($course);
             $gui->init();
             while ($userdata = $gui->next_user()) {