MDL-18726 dml cleanup

diff --git a/grade/report/stats/index.php b/grade/report/stats/index.php
index 1e9cb9cc9f61f93f9985118d71d62c778e7d9093..891c8422ae279268e87508098ef84cf3f14f9d09 100755 (executable)
--- a/grade/report/stats/index.php
+++ b/grade/report/stats/index.php
@@ -34,14 +34,12 @@ require_once $CFG->libdir.'/gradelib.php';
 require_once $CFG->dirroot.'/grade/lib.php';
 require_once $CFG->dirroot.'/grade/report/stats/lib.php';
 
-$courseid = required_param('id');
+$courseid = required_param('id', PARAM_INT);
 $toggle = optional_param('toggle', NULL, PARAM_INT);
 $toggle_type = optional_param('toggle_type', 0, PARAM_ALPHANUM);
 
 /// basic access checks
-$course = $DB->get_record('course', array('id' => $courseid));
-
-if (!$course) {
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
 

diff --git a/grade/report/stats/lib.php b/grade/report/stats/lib.php
index a67b58ca4da584a06c11fac0fca74cdce626937f..30abffd867cf46547ed3d31b244ba8a4ac88e285 100755 (executable)
--- a/grade/report/stats/lib.php
+++ b/grade/report/stats/lib.php
@@ -194,13 +194,9 @@ class grade_report_stats extends grade_report {
             $this->users = array();
             $this->userselect_params = array();
         } else {
-            if(isset($DB) && !is_null($DB)) {
-                list($usql, $params) = $DB->get_in_or_equal(array_keys($this->users));
-                $this->userselect = "AND g.userid $usql";
-                $this->userselect_params = $params;
-            }else{
-                $this->userselect = 'AND g.userid in ('.implode(',', array_keys($this->users)).')';
-            }
+            list($usql, $params) = $DB->get_in_or_equal(array_keys($this->users));
+            $this->userselect = "AND g.userid $usql";
+            $this->userselect_params = $params;
         }
 
         return $this->users;
@@ -234,25 +230,15 @@ class grade_report_stats extends grade_report {
 
         $params = array();
 
-        if(isset($DB) && !is_null($DB)) {
-            $params = array_merge(array($this->courseid), $this->userselect_params);
-
-            /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
-            $sql = "SELECT g.*
-                  FROM {grade_items} gi,
-                       {grade_grades} g
-                 WHERE g.itemid = gi.id AND gi.courseid = ? {$this->userselect}";
+        $params = array_merge(array($this->courseid), $this->userselect_params);
 
-            $grades = $DB->get_records_sql($sql, $params);
-        } else {
-            /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
-            $sql = "SELECT g.*
-                  FROM {grade_items} gi,
-                       {grade_grades} g
-                 WHERE g.itemid = gi.id AND gi.courseid = {$this->courseid} {$this->userselect}";
+        /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
+        $sql = "SELECT g.*
+              FROM {grade_items} gi,
+                   {grade_grades} g
+             WHERE g.itemid = gi.id AND gi.courseid = ? {$this->userselect}";
 
-            $grades = $DB->get_records_sql($sql);
-        }
+        $grades = $DB->get_records_sql($sql, $params);
 
         $userids = array_keys($this->users);
 

diff --git a/grade/report/stats/preferences.php b/grade/report/stats/preferences.php
index 669de0c3b3cbb2e9e682b7661dd04a8dfcbd5d69..20450c3c07e3b028cd0cbec6b0ac0799cdd3fe33 100755 (executable)
--- a/grade/report/stats/preferences.php
+++ b/grade/report/stats/preferences.php
@@ -36,13 +36,7 @@ $courseid = required_param('id', PARAM_INT);
 
 
 /// Make sure they can even access this course
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
-}
-
-if (!$course) {
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
 

diff --git a/grade/report/stats/print.php b/grade/report/stats/print.php
index de9033a65744398cf701bc1f94312c7fac5c5df0..bf55173361b093112b52180a52ea4c076c6fb0b7 100644 (file)
--- a/grade/report/stats/print.php
+++ b/grade/report/stats/print.php
@@ -37,13 +37,8 @@ $courseid = required_param('id');
 $reportname = get_string('modulename', 'gradereport_stats');
 
 /// basic access checks
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
-}
-if (!$course) {
-        print_error('nocourseid');
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
+    print_error('nocourseid');
 }
 require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);

diff --git a/grade/report/visual/data.php b/grade/report/visual/data.php
index ee8e7afb1bc4a0f7c7606f5b49a4e59fdf7b4e4c..e460f57241366c64ddccca9c6def1fc8302bd315 100644 (file)
--- a/grade/report/visual/data.php
+++ b/grade/report/visual/data.php
@@ -47,12 +47,7 @@ $courseid = required_param('id');
 $visid = optional_param('visid');
 
 /// basic access checks
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
-}
-if (!$course) {
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
         print_error('nocourseid');
 }
 require_login($course);

diff --git a/grade/report/visual/index.php b/grade/report/visual/index.php
index 06c064b8eea50e55e78a41ddf42425f3f889ce8c..5d35831348fa5e91747a8faf6e79dbe8124cffce 100644 (file)
--- a/grade/report/visual/index.php
+++ b/grade/report/visual/index.php
@@ -35,12 +35,7 @@ $courseid = required_param('id');
 $visid = optional_param('visid');
 
 /// basic access checks
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
-}
-if (!$course) {
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
         print_error('nocourseid');
 }
 require_login($course);

diff --git a/grade/report/visual/lib.php b/grade/report/visual/lib.php
index 2875a94322d26c87558bf4943c000cecefb2878a..d02796779bc831ea1049977c5f513b58929336d9 100755 (executable)
--- a/grade/report/visual/lib.php
+++ b/grade/report/visual/lib.php
@@ -224,44 +224,28 @@ class grade_report_visual extends grade_report {
     public function load_users() {
         global $CFG, $DB;
 
-        if(isset($DB) && !is_null($DB)) {
-            $params = array();
-            list($usql, $gbr_params) = $DB->get_in_or_equal(explode(',', $this->gradebookroles));
-
-            $sql = "SELECT u.id, u.firstname, u.lastname, u.imagealt, u.picture, u.idnumber, u.username
-                    FROM {user} u
-                        JOIN {role_assignments} ra ON u.id = ra.userid
-                        $this->groupsql
-                    WHERE ra.roleid $usql
-                        $this->groupwheresql
-                        AND ra.contextid ".get_related_contexts_string($this->context);
-
-            $params = array_merge($gbr_params, $this->groupwheresql_params);
-            $this->users = $DB->get_records_sql($sql, $params);
-        } else {
-            $sql = "SELECT u.id, u.firstname, u.lastname, u.imagealt, u.picture, u.idnumber
-                      FROM {user) u
-                           JOIN {role_assignments} ra ON u.id = ra.userid
-                           $this->groupsql
-                     WHERE ra.roleid in ($this->gradebookroles)
-                           $this->groupwheresql
-                           AND ra.contextid ".get_related_contexts_string($this->context);
-
-            $this->users = $DB->get_records_sql($sql);
-        }
+        $params = array();
+        list($usql, $gbr_params) = $DB->get_in_or_equal(explode(',', $this->gradebookroles));
+
+        $sql = "SELECT u.id, u.firstname, u.lastname, u.imagealt, u.picture, u.idnumber, u.username
+                FROM {user} u
+                    JOIN {role_assignments} ra ON u.id = ra.userid
+                    $this->groupsql
+                WHERE ra.roleid $usql
+                    $this->groupwheresql
+                    AND ra.contextid ".get_related_contexts_string($this->context);
+
+        $params = array_merge($gbr_params, $this->groupwheresql_params);
+        $this->users = $DB->get_records_sql($sql, $params);
 
         if (empty($this->users)) {
             $this->userselect = '';
             $this->users = array();
             $this->userselect_params = array();
         } else {
-            if(isset($DB) && !is_null($DB)) {
-                list($usql, $params) = $DB->get_in_or_equal(array_keys($this->users));
-                $this->userselect = "AND g.userid $usql";
-                $this->userselect_params = $params;
-            }else{
-                $this->userselect = 'AND g.userid in ('.implode(',', array_keys($this->users)).')';
-            }
+            list($usql, $params) = $DB->get_in_or_equal(array_keys($this->users));
+            $this->userselect = "AND g.userid $usql";
+            $this->userselect_params = $params;
         }
 
         return $this->users;
@@ -277,25 +261,15 @@ class grade_report_visual extends grade_report {
 
         $params = array();
 
-        if(isset($DB) && !is_null($DB)) {
-            $params = array_merge(array($this->courseid), $this->userselect_params);
-
-            /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
-            $sql = "SELECT g.*
-                  FROM {grade_items} gi,
-                       {grade_grades} g
-                 WHERE g.itemid = gi.id AND gi.courseid = ? {$this->userselect}";
+        $params = array_merge(array($this->courseid), $this->userselect_params);
 
-            $grades = $DB->get_records_sql($sql, $params);
-        } else {
-            /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
-            $sql = "SELECT g.*
-                  FROM {grade_items} gi,
-                       {grade_grades} g
-                 WHERE g.itemid = gi.id AND gi.courseid = {$this->courseid} {$this->userselect}";
+        /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
+        $sql = "SELECT g.*
+              FROM {grade_items} gi,
+                   {grade_grades} g
+             WHERE g.itemid = gi.id AND gi.courseid = ? {$this->userselect}";
 
-            $grades = get_records_sql($sql);
-        }
+        $grades = $DB->get_records_sql($sql, $params);
 
         $userids = array_keys($this->users);
 

diff --git a/grade/report/visual/preferences.php b/grade/report/visual/preferences.php
index 884fec697727373c602c47330ffc5d29ef8adb0d..30ff069182a17ea1d9fe341c1f878f3997e8e7a6 100755 (executable)
--- a/grade/report/visual/preferences.php
+++ b/grade/report/visual/preferences.php
@@ -36,17 +36,11 @@ $courseid = required_param('id', PARAM_INT);
 
 
 /// Make sure they can even access this course
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
+        print_error('nocourseid');
 }
 
-if (!$course) {
-    print_error('nocourseid');
-}
-
-require_login($course->id);
+require_login($course);
 
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 $systemcontext = get_context_instance(CONTEXT_SYSTEM);

diff --git a/grade/report/visual/print.php b/grade/report/visual/print.php
index 679cfe2db1234cf06c5277a45e37261eee496de4..e585ab41b3fcbcda3301868bcf33e7b6276e9da7 100644 (file)
--- a/grade/report/visual/print.php
+++ b/grade/report/visual/print.php
@@ -31,17 +31,12 @@ require_once $CFG->libdir.'/gradelib.php';
 require_once $CFG->dirroot.'/grade/lib.php';
 require_once $CFG->dirroot.'/grade/report/visual/lib.php';
 
-$courseid = required_param('id');
+$courseid = required_param('id', PARAM_INT);
 $visid = optional_param('visid');
 
 /// basic access checks
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
-}
-if (!$course) {
-        print_error('nocourseid');
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
+    print_error('nocourseid');
 }
 require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);

diff --git a/grade/report/visual/visual_settings.php b/grade/report/visual/visual_settings.php
index 85b2210a1b27b56c7c2e819765b65a964665fb26..bf6fbffac11d1529fc74b68290b7f56366158d09 100644 (file)
--- a/grade/report/visual/visual_settings.php
+++ b/grade/report/visual/visual_settings.php
@@ -47,12 +47,7 @@ $visname = required_param('visid');
 $courseid = required_param('id');
 
 /// basic access checks
-if(isset($DB) && !is_null($DB)) {
-    $course = $DB->get_record('course', array('id' => $courseid));
-} else {
-    $course = get_record('course', 'id', $courseid);
-}
-if (!$course) {
+if (!$course = $DB->get_record('course', array('id' => $courseid))) {
         print_error('nocourseid');
 }
 require_login($course);

diff --git a/grade/report/visual/visualizations/visual_grade_distribution_bar.php b/grade/report/visual/visualizations/visual_grade_distribution_bar.php
index f789dd58f94515d55addbc84e7915caf27736478..ef946814335c418f457f7de75c58b80b5e871163 100644 (file)
--- a/grade/report/visual/visualizations/visual_grade_distribution_bar.php
+++ b/grade/report/visual/visualizations/visual_grade_distribution_bar.php
@@ -70,19 +70,15 @@ class grade_distribution_bar extends visualization {
             $options[$groupkey] = grade_report_visual::truncate($group->name);
         }
         $options[0] = 'All Groups';
-        
-        if(isset($DB) && !is_null($DB)) {
-            $course = $DB->get_record('course', array('id' => required_param('id')));
-        } else {
-            $course = get_record('course', 'id', required_param('id'));
-        }
-        if (!$course) {
+
+// TODO: move the required_param elsewhere!!
+        if (!$course = $DB->get_record('course', array('id' => required_param('id', PARAM_INT)))) {
             print_error('nocourseid');
         }
         
         $active = groups_get_course_group($course, true);
         
-        if(!$active) {
+        if (!$active) {
             $active = 0;
         }