MDL-32322 quiz reports: get_context_instance -> new classes.

Also, eliminate unnecessary use of global $COURSE.
moodle · Apr 20, 2012 · 26aded5 · 26aded5
1 parent ead4f18
commit 26aded5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 28 deletions.
diff --git a/mod/quiz/report/attemptsreport.php b/mod/quiz/report/attemptsreport.php
@@ -346,7 +346,7 @@ public function col_checkbox($attempt) {
     }
 
     public function col_picture($attempt) {
-        global $COURSE, $OUTPUT;
+        global $OUTPUT;
         $user = new stdClass();
         $user->id = $attempt->userid;
         $user->lastname = $attempt->lastname;

diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
@@ -84,7 +84,7 @@ public function display($quiz, $cm, $course) {
         }
 
         // Check permissions
-        $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $this->context = context_module::instance($cm->id);
         require_capability('mod/quiz:grade', $this->context);
         $shownames = has_capability('quiz/grading:viewstudentnames', $this->context);
         $showidnumbers = has_capability('quiz/grading:viewidnumber', $this->context);

diff --git a/mod/quiz/report/overview/overviewgraph.php b/mod/quiz/report/overview/overviewgraph.php
@@ -37,7 +37,7 @@
 $cm = get_coursemodule_from_instance('quiz', $quizid);
 
 require_login($course, false, $cm);
-$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+$modcontext = context_module::instance($cm->id);
 require_capability('mod/quiz:viewreports', $modcontext);
 
 if ($groupid && $groupmode = groups_get_activity_groupmode($cm)) {

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
@@ -40,9 +40,9 @@
 class quiz_overview_report extends quiz_attempt_report {
 
     public function display($quiz, $cm, $course) {
-        global $CFG, $COURSE, $DB, $OUTPUT;
+        global $CFG, $DB, $OUTPUT;
 
-        $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $this->context = context_module::instance($cm->id);
 
         $download = optional_param('download', '', PARAM_ALPHA);
 
@@ -117,24 +117,19 @@ public function display($quiz, $cm, $course) {
             $allowed = array();
         }
 
-        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-        $courseshortname = format_string($course->shortname, true,
-                array('context' => $coursecontext));
-
-        $displaycoursecontext = get_context_instance(CONTEXT_COURSE, $COURSE->id);
-        $displaycourseshortname = format_string($COURSE->shortname, true,
-                array('context' => $displaycoursecontext));
-
         // Load the required questions.
         $questions = quiz_report_get_significant_questions($quiz);
 
+        // Prepare for downloading, if applicable.
+        $courseshortname = format_string($course->shortname, true,
+                array('context' => context_course::instance($course->id)));
         $table = new quiz_overview_table($quiz, $this->context, $qmsubselect,
                 $qmfilter, $attemptsmode, $groupstudents, $students, $detailedmarks,
                 $questions, $includecheckboxes, $reporturl, $displayoptions);
         $filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'),
                 $courseshortname, $quiz->name);
         $table->is_downloading($download, $filename,
-                $displaycourseshortname . ' ' . format_string($quiz->name, true));
+                $courseshortname . ' ' . format_string($quiz->name, true));
         if ($table->is_downloading()) {
             raise_memory_limit(MEMORY_EXTRA);
         }

diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php
@@ -48,9 +48,9 @@
 class quiz_responses_report extends quiz_attempt_report {
 
     public function display($quiz, $cm, $course) {
-        global $CFG, $COURSE, $DB, $PAGE, $OUTPUT;
+        global $CFG, $DB, $PAGE, $OUTPUT;
 
-        $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $this->context = context_module::instance($cm->id);
 
         $download = optional_param('download', '', PARAM_ALPHA);
 
@@ -137,21 +137,15 @@ public function display($quiz, $cm, $course) {
         // Load the required questions.
         $questions = quiz_report_get_significant_questions($quiz);
 
-        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
         $courseshortname = format_string($course->shortname, true,
-                array('context' => $coursecontext));
-
-        $displaycoursecontext = get_context_instance(CONTEXT_COURSE, $COURSE->id);
-        $displaycourseshortname = format_string($COURSE->shortname, true,
-                array('context' => $displaycoursecontext));
-
+                array('context' => context_course::instance($course->id)));
         $table = new quiz_responses_table($quiz, $this->context, $qmsubselect,
                 $qmfilter, $attemptsmode, $groupstudents, $students, $questions,
                 $includecheckboxes, $reporturl, $displayoptions);
         $filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'),
                 $courseshortname, $quiz->name);
         $table->is_downloading($download, $filename,
-                $displaycourseshortname . ' ' . format_string($quiz->name, true));
+                $courseshortname . ' ' . format_string($quiz->name, true));
         if ($table->is_downloading()) {
             raise_memory_limit(MEMORY_EXTRA);
         }

diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
@@ -54,7 +54,7 @@ class quiz_statistics_report extends quiz_default_report {
     public function display($quiz, $cm, $course) {
         global $CFG, $DB, $OUTPUT, $PAGE;
 
-        $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $this->context = context_module::instance($cm->id);
 
         // Work out the display options.
         $download = optional_param('download', '', PARAM_ALPHA);
@@ -118,9 +118,8 @@ public function display($quiz, $cm, $course) {
         } else {
             $report = get_string('questionstatsfilename', 'quiz_statistics');
         }
-        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
         $courseshortname = format_string($course->shortname, true,
-                array('context' => $coursecontext));
+                array('context' => context_course::instance($course->id)));
         $filename = quiz_report_download_filename($report, $courseshortname, $quiz->name);
         $this->table->is_downloading($download, $filename,
                 get_string('quizstructureanalysis', 'quiz_statistics'));

diff --git a/mod/quiz/report/statistics/statistics_graph.php b/mod/quiz/report/statistics/statistics_graph.php
@@ -62,7 +62,7 @@ function graph_get_new_colour() {
 
 // Check access.
 require_login($quiz->course, false, $cm);
-$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+$modcontext = context_module::instance($cm->id);
 require_capability('quiz/statistics:view', $modcontext);
 
 if (groups_get_activity_groupmode($cm)) {