From 24b464d9f7cc314ebc72efb98c2fa3a101078007 Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Wed, 30 May 2012 16:36:43 +1200
Subject: [PATCH] Revert "Merge branch 'MDL-27675_21_wip' of
 git://github.com/grabs/moodle into MOODLE_21_STABLE"

This reverts commit 9c96488ed967a5923fd082ab9b30cab9409f99ff, reversing
changes made to b22884274f8e7729c5a9145b3b355fb1d4b03527.
---
 mod/feedback/complete.php                  |  3 +--
 mod/feedback/complete_guest.php            |  5 ++---
 mod/feedback/item/captcha/lib.php          |  9 ---------
 mod/feedback/item/feedback_item_class.php  |  9 ---------
 mod/feedback/item/info/lib.php             |  9 ---------
 mod/feedback/item/label/lib.php            |  9 ---------
 mod/feedback/item/multichoice/lib.php      | 20 ++------------------
 mod/feedback/item/multichoicerated/lib.php |  8 --------
 mod/feedback/item/numeric/lib.php          |  9 ---------
 mod/feedback/item/textarea/lib.php         |  9 ---------
 mod/feedback/item/textfield/lib.php        |  9 ---------
 mod/feedback/lib.php                       | 12 ------------
 12 files changed, 5 insertions(+), 106 deletions(-)

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 62c69b2bd99..c4d72b71d67 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -434,8 +434,7 @@
                         //get the value
                         $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;
                         if(isset($savereturn)) {
-                            $value = isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL;
-                            $value = feedback_clean_input_value($feedbackitem, $value);
+                            $value =  isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL;
                         }else {
                             if(isset($feedbackcompletedtmp->id)) {
                                 $value = feedback_get_item_value($feedbackcompletedtmp->id, $feedbackitem->id, true);
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 81c68667e25..99c530f41ce 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -54,7 +54,7 @@
 
     //if the use hit enter into a textfield so the form should not submit
     if(isset($formdata->sesskey) AND !isset($formdata->savevalues) AND !isset($formdata->gonextpage) AND !isset($formdata->gopreviouspage)) {
-        $gopage = (int)$formdata->lastpage;
+        $gopage = $formdata->lastpage;
     }
     if(isset($formdata->savevalues)) {
         $savevalues = true;
@@ -383,8 +383,7 @@
                         //get the value
                         $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;
                         if(isset($savereturn)) {
-                            $value = isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL;
-                            $value = feedback_clean_input_value($feedbackitem, $value);
+                            $value =  isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL;
                         }else {
                             if(isset($feedbackcompletedtmp->id)) {
                                 $value = feedback_get_item_value($feedbackcompletedtmp->id, $feedbackitem->id, sesskey());
diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php
index af5f7ec5d0c..0dcca48e483 100644
--- a/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@ -280,13 +280,4 @@ class feedback_item_captcha extends feedback_item_base {
     function can_switch_require() {
         return false;
     }
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param($value, PARAM_RAW);
-    }
 }
diff --git a/mod/feedback/item/feedback_item_class.php b/mod/feedback/item/feedback_item_class.php
index 49cc96c0cc3..ddcfcd71496 100644
--- a/mod/feedback/item/feedback_item_class.php
+++ b/mod/feedback/item/feedback_item_class.php
@@ -104,14 +104,6 @@ abstract class feedback_item_base {
      */
     abstract function print_item_show_value($item, $value = '');
 
-    /**
-     * cleans the userinput while submitting the form
-     *
-     * @param mixed $value
-     * @return mixed
-     */
-    abstract public function clean_input_value($value);
-
 }
 
 //a dummy class to realize pagebreaks
@@ -137,7 +129,6 @@ class feedback_item_pagebreak extends feedback_item_base {
     function print_item_complete($item, $value = '', $highlightrequire = false) {}
     function print_item_show_value($item, $value = '') {}
     function can_switch_require(){}
-    function clean_input_value($value){}
 
 }
 
diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php
index d34df997f9b..cefe0003d01 100644
--- a/mod/feedback/item/info/lib.php
+++ b/mod/feedback/item/info/lib.php
@@ -323,13 +323,4 @@ class feedback_item_info extends feedback_item_base {
     function can_switch_require() {
         return false;
     }
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param($value, PARAM_INT);
-    }
 }
diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php
index e13394c6a5b..f1beca5ac2b 100644
--- a/mod/feedback/item/label/lib.php
+++ b/mod/feedback/item/label/lib.php
@@ -233,13 +233,4 @@ class feedback_item_label extends feedback_item_base {
     function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {}
     function get_printval($item, $value) {}
     function get_analysed($item, $groupid = false, $courseid = false) {}
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return '';
-    }
 }
diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 79936704512..cb5cb8f1e42 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -710,24 +710,8 @@ class feedback_item_multichoice extends feedback_item_base {
         return false;
     }
 
-    public function can_switch_require() {
+
+    function can_switch_require() {
         return true;
     }
-
-    public function value_type() {
-        return PARAM_INT;
-    }
-
-    public function value_is_array() {
-        return true;
-    }
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param_array($value, PARAM_INT);
-    }
 }
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index d7c6150cae2..e803cd62ec9 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -589,12 +589,4 @@ class feedback_item_multichoicerated extends feedback_item_base {
         return true;
     }
 
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param($value, PARAM_INT);
-    }
 }
diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index 452b8799f0b..cf646d1348d 100644
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -420,13 +420,4 @@ class feedback_item_numeric extends feedback_item_base {
     function can_switch_require() {
         return true;
     }
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param($value, PARAM_FLOAT);
-    }
 }
diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index 3adc5922b8f..1b4cd134423 100644
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -280,13 +280,4 @@ class feedback_item_textarea extends feedback_item_base {
     function can_switch_require() {
         return true;
     }
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param($value, PARAM_CLEANHTML);
-    }
 }
diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index 929c2742cd3..74f9b88657f 100644
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -274,13 +274,4 @@ class feedback_item_textfield extends feedback_item_base {
     function can_switch_require() {
         return true;
     }
-
-    /**
-     * Cleans the value coming from the user for a field of this type.
-     * @param mixed $value
-     * @return mixed
-     */
-    public function clean_input_value($value) {
-        return clean_param($value, PARAM_CLEANHTML);
-    }
 }
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 36bb7dd0480..5ecf3d0ac6c 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -1927,18 +1927,6 @@ function feedback_get_page_to_continue($feedbackid, $courseid = false, $guestid
 //functions to handle the values
 ////////////////////////////////////////////////
 
-/**
- * cleans the userinput while submitting the form.
- *
- * @param stdClass $item The feedback item record from the database that the value needs to be cleaned against.
- * @param mixed $value
- * @return mixed
- */
-function feedback_clean_input_value($item, $value) {
-    $itemobj = feedback_get_item_class($item->typ);
-    return $itemobj->clean_input_value($value);
-}
-
 /**
  * this saves the values of an completed.
  * if the param $tmp is set true so the values are saved temporary in table feedback_valuetmp.