From 0cd89526dc5e1d305fa55015ded4d47386b2208f Mon Sep 17 00:00:00 2001
From: Pierre Pichet <pichet.pierre@uqam.ca>
Date: Tue, 7 Sep 2010 20:45:01 +0000
Subject: [PATCH] MDL-24105 adding parameters to optional_param() calls

---
 question/type/calculated/datasetitems_form.php              | 3 +--
 .../type/calculatedsimple/edit_calculatedsimple_form.php    | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/question/type/calculated/datasetitems_form.php b/question/type/calculated/datasetitems_form.php
index f16dd2c8b38..e3253d5315c 100644
--- a/question/type/calculated/datasetitems_form.php
+++ b/question/type/calculated/datasetitems_form.php
@@ -53,7 +53,6 @@ class question_dataset_dependent_items_form extends moodleform {
         }
 
         foreach ($this->datasetdefs as $datasetdef) {
-
             // Get maxnumber
             if ($this->maxnumber == -1 || $datasetdef->itemcount < $this->maxnumber) {
                 $this->maxnumber = $datasetdef->itemcount;
@@ -209,7 +208,7 @@ class question_dataset_dependent_items_form extends moodleform {
 //------------------------------------------------------------------------------------------------------------------------------
         $j = $this->noofitems * count($this->datasetdefs);
         $k = 1 ;
-        if ("" != optional_param('selectshow')){
+        if ("" != optional_param('selectshow', '', PARAM_INT)){
             $k = optional_param('selectshow', '', PARAM_INT);
         }
         for ($i = $this->noofitems; $i >= 1 ; $i--){
diff --git a/question/type/calculatedsimple/edit_calculatedsimple_form.php b/question/type/calculatedsimple/edit_calculatedsimple_form.php
index 8c84517e4b7..fe3e8171400 100644
--- a/question/type/calculatedsimple/edit_calculatedsimple_form.php
+++ b/question/type/calculatedsimple/edit_calculatedsimple_form.php
@@ -224,7 +224,7 @@ class question_edit_calculatedsimple_form extends question_edit_form {
             }
         }
         $maxnumber = -1 ;
-        if  (  "" !=optional_param('addbutton')){
+        if  (  "" !=optional_param('addbutton', '', PARAM_TEXT)){
             $maxnumber = optional_param('selectadd', '', PARAM_INT); //FIXME: sloppy coding
             foreach ($this->datasetdefs as $defid => $datasetdef) {
                 $datasetdef->itemcount = $maxnumber;
@@ -240,7 +240,7 @@ class question_edit_calculatedsimple_form extends question_edit_form {
             $this->maxnumber = $maxnumber ;
         }else {
             // Handle reload dataset items
-            if  (  "" !=optional_param('definition')&& !($datasettoremove ||$newdataset ||$newdatasetvalues )){
+            if  (  "" !=optional_param('definition','', PARAM_NOTAGS)&& !($datasettoremove ||$newdataset ||$newdatasetvalues )){
                 $i = 1;
                 $fromformdefinition = optional_param('definition', '', PARAM_NOTAGS);
                 $fromformnumber = optional_param('number', '', PARAM_INT);
@@ -486,7 +486,7 @@ class question_edit_calculatedsimple_form extends question_edit_form {
                 //------------------------------------------------------------------------------------------------------------------------------
                 $j = $this->noofitems * count($this->datasetdefs);
                 $k = 1 ;
-                if ("" != optional_param('selectshow')){
+                if ("" != optional_param('selectshow', '', PARAM_INT)){
                     $k = optional_param('selectshow', '', PARAM_INT);
                 }