MDL-15384 'change name of quiz report classes to "quiz_{reportname}_report"' easy...

diff --git a/mod/quiz/report.php b/mod/quiz/report.php
index e53d68865f156e1fd503aa89505584fe8a227d7f..f3260013ba6da47bf4f8eff178859255d4c7f69d 100644 (file)
--- a/mod/quiz/report.php
+++ b/mod/quiz/report.php
@@ -59,8 +59,6 @@
 
 /// Open the selected quiz report and display it
 
-    $mode = clean_param($mode, PARAM_SAFEDIR);
-
     if (! is_readable("report/$mode/report.php")) {
         print_error('reportnotfound', 'quiz', '', $mode);
     }
@@ -68,7 +66,8 @@
     include("report/default.php");  // Parent class
     include("report/$mode/report.php");
 
-    $report = new quiz_report();
+    $reportclassname = "quiz_{$mode}_report";
+    $report = new $reportclassname();
 
     if (! $report->display($quiz, $cm, $course)) {             // Run the report!
         print_error("preprocesserror", 'quiz');

diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php
index 13e8a91aafaff91e2c4a67669510866a107a1741..7720494765c0bff62f466f39644a76ccdbe057d5 100644 (file)
--- a/mod/quiz/report/analysis/report.php
+++ b/mod/quiz/report/analysis/report.php
@@ -3,7 +3,7 @@
     require_once($CFG->libdir.'/tablelib.php');
 
 /// Item analysis displays a table of quiz questions and their performance
-class quiz_report extends quiz_default_report {
+class quiz_analysis_report extends quiz_default_report {
 
     function display($quiz, $cm, $course) {     /// This function just displays the report
         global $CFG, $SESSION, $QTYPES, $DB;

diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 5df665bb170a07d00ea5761183f9f03f578848c7..d6e2789ce57c9597dea037e602db3287fef51253 100644 (file)
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -23,7 +23,7 @@ require_once($CFG->libdir . '/tablelib.php');
  * @package quiz
  * @subpackage reports
  */
-class quiz_report extends quiz_default_report {
+class quiz_grading_report extends quiz_default_report {
     /**
      * Displays the report.
      */

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 045159aa738ab9e43ef563808c4d8b8ee915295a..b5b47e77aeaf773593dd1a76401bac6921a56103 100644 (file)
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -12,7 +12,7 @@ require_once($CFG->libdir.'/tablelib.php');
 require_once($CFG->dirroot.'/mod/quiz/report/overview/overviewsettings_form.php');
 require_once($CFG->dirroot.'/mod/quiz/report/overview/overview_table.php');
 
-class quiz_report extends quiz_default_report {
+class quiz_overview_report extends quiz_default_report {
 
     /**
      * Display the report.

diff --git a/mod/quiz/report/regrade/report.php b/mod/quiz/report/regrade/report.php
index 97daf5fd301c1ce46c637cf5d7e328ec5f9eb11c..77b64cfa2d9b2b07371a988c6151cb738dd84593 100644 (file)
--- a/mod/quiz/report/regrade/report.php
+++ b/mod/quiz/report/regrade/report.php
@@ -3,7 +3,7 @@
 // This script regrades all attempts at this quiz
 require_once($CFG->libdir.'/tablelib.php');
 
-class quiz_report extends quiz_default_report {
+class quiz_regrade_report extends quiz_default_report {
 
     function display($quiz, $cm, $course) {
         global $CFG, $DB;

diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index 48dbc6377cc788e0b86d0390d68565bb3e8e6880..e24ffea69b3026a1ca4c8f59290862d52bd24d69 100644 (file)
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -11,7 +11,7 @@
 require_once($CFG->dirroot.'/mod/quiz/report/statistics/statistics_form.php');
 require_once($CFG->dirroot.'/mod/quiz/report/statistics/statistics_table.php');
 
-class quiz_report extends quiz_default_report {
+class quiz_statistics_report extends quiz_default_report {
 
     /**
      * Display the report.