MDL-13678 "Change default number of rows per page on quiz reports" Made a new constan...

[moodle.git] / mod / quiz / report / analysis / report.php

diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php
index dac42cf..67fc709 100644 (file)
--- a/mod/quiz/report/analysis/report.php
+++ b/mod/quiz/report/analysis/report.php
@@ -32,18 +32,21 @@ class quiz_report extends quiz_default_report {
 
         // set Table and Analysis stats options
         if(!isset($SESSION->quiz_analysis_table)) {
-            $SESSION->quiz_analysis_table = array('attemptselection' => 0, 'lowmarklimit' => 0, 'pagesize' => 10);
+            $SESSION->quiz_analysis_table = array('attemptselection' => 0, 'lowmarklimit' => 0, 'pagesize' => QUIZ_REPORT_DEFAULT_PAGE_SIZE);
         }
 
         foreach($SESSION->quiz_analysis_table as $option => $value) {
-            $urlparam = optional_param($option, NULL);
+            $urlparam = optional_param($option, NULL, PARAM_INT);
             if($urlparam === NULL) {
                 $$option = $value;
-            }
-            else {
+            } else {
                 $$option = $SESSION->quiz_analysis_table[$option] = $urlparam;
             }
         }
+        if (!isset($pagesize) || ((int)$pagesize < 1) ){
+            $pagesize = QUIZ_REPORT_DEFAULT_PAGE_SIZE;
+        }
+
 
         $scorelimit = $quiz->sumgrades * $lowmarklimit/ 100;
 
@@ -323,9 +326,6 @@ class quiz_report extends quiz_default_report {
         $format_options->newlines = false;
 
         // Now it is time to page the data, simply slice the keys in the array
-        if (!isset($pagesize) || ((int)$pagesize < 1) ){
-            $pagesize = 10;
-        }
         $table->pagesize($pagesize, count($questions));
         $start = $table->get_page_start();
         $pagequestions = array_slice(array_keys($questions), $start, $pagesize);
@@ -381,7 +381,7 @@ class quiz_report extends quiz_default_report {
     }
 
 
-    function print_options_form($quiz, $cm, $attempts, $lowlimit=0, $pagesize=10) {
+    function print_options_form($quiz, $cm, $attempts, $lowlimit=0, $pagesize=QUIZ_REPORT_DEFAULT_PAGE_SIZE) {
         global $CFG, $USER;
         echo '<div class="controls">';
         echo '<form id="options" action="report.php" method="post">';