From c386eaa3dfbb02e97b80c3d3f363566231e2bfa0 Mon Sep 17 00:00:00 2001 From: jamiesensei Date: Tue, 24 Jun 2008 08:59:29 +0000 Subject: [PATCH] MDL-15384 'change name of quiz report classes to "quiz_{reportname}_report"' easy to do, changed class name of all reports and changed the code in report.php which instantiates the correct class. --- mod/quiz/report.php | 5 ++--- mod/quiz/report/analysis/report.php | 2 +- mod/quiz/report/grading/report.php | 2 +- mod/quiz/report/overview/report.php | 2 +- mod/quiz/report/regrade/report.php | 2 +- mod/quiz/report/statistics/report.php | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mod/quiz/report.php b/mod/quiz/report.php index e53d68865f..f3260013ba 100644 --- 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 13e8a91aaf..7720494765 100644 --- 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 5df665bb17..d6e2789ce5 100644 --- 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 045159aa73..b5b47e77ae 100644 --- 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 97daf5fd30..77b64cfa2d 100644 --- 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 48dbc6377c..e24ffea69b 100644 --- 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. -- 2.39.5