Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle

diff --cc mod/feedback/item/captcha/lib.php
index 126d51e,190b136..f790a65
--- 1/mod/feedback/item/captcha/lib.php
--- 2/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@@ -326,4 -326,12 +326,12 @@@ class feedback_item_captcha extends fee
      public function can_switch_require() {
          return false;
      }
 -    function clean_input_value($value) {
+ 
+     public function value_type() {
+         return PARAM_RAW;
+     }
+ 
++    public function clean_input_value($value) {
+         return clean_param($value, $this->value_type());
+     }
  }

diff --cc mod/feedback/item/feedback_item_class.php
index 981aefd,f325ed7..a1b7d3c
--- 1/mod/feedback/item/feedback_item_class.php
--- 2/mod/feedback/item/feedback_item_class.php
+++ b/mod/feedback/item/feedback_item_class.php
@@@ -128,6 -125,14 +128,14 @@@ abstract class feedback_item_base 
       */
      abstract public function print_item_show_value($item, $value = '');
  
 -    abstract function clean_input_value($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

diff --cc mod/feedback/item/info/lib.php
index 299fef2,8d8eef5..fbdf2d9
--- 1/mod/feedback/item/info/lib.php
--- 2/mod/feedback/item/info/lib.php
+++ b/mod/feedback/item/info/lib.php
@@@ -388,4 -388,12 +388,12 @@@ class feedback_item_info extends feedba
      public function can_switch_require() {
          return false;
      }
 -    function clean_input_value($value) {
+ 
+     public function value_type() {
+         return PARAM_INT;
+     }
+ 
++    public function clean_input_value($value) {
+         return clean_param($value, $this->value_type());
+     }
  }

diff --cc mod/feedback/item/multichoicerated/lib.php
index 031f7b8,5dd8583..ca43a44
--- 1/mod/feedback/item/multichoicerated/lib.php
--- 2/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@@ -678,4 -678,11 +678,11 @@@ class feedback_item_multichoicerated ex
          return true;
      }
  
 -    function clean_input_value($value) {
+     public function value_type() {
+         return PARAM_INT;
+     }
+ 
++    public function clean_input_value($value) {
+         return clean_param($value, $this->value_type());
+     }
  }

diff --cc mod/feedback/item/numeric/lib.php
index 2369413,280e8f9..ada5d32
--- 1/mod/feedback/item/numeric/lib.php
--- 2/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@@ -534,4 -534,15 +534,15 @@@ class feedback_item_numeric extends fee
      public function can_switch_require() {
          return true;
      }
 -    function clean_input_value($value) {
+     
+     public function value_type() {
+         return PARAM_FLOAT;
+     }
+ 
++    public function clean_input_value($value) {
+         if (!is_numeric($value)) {
+             return null;
+         }
+         return clean_param($value, $this->value_type());
+     }
  }

diff --cc mod/feedback/item/textarea/lib.php
index 54df5e6,678fcf0..74605bc
--- 1/mod/feedback/item/textarea/lib.php
--- 2/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@@ -333,4 -333,12 +333,12 @@@ class feedback_item_textarea extends fe
      public function can_switch_require() {
          return true;
      }
 -    function clean_input_value($value) {
+ 
+     public function value_type() {
+         return PARAM_RAW;
+     }
+ 
++    public function clean_input_value($value) {
+         return s($value);
+     }
  }

diff --cc mod/feedback/item/textfield/lib.php
index 4051ffb,94e1cad..0d151ae
--- 1/mod/feedback/item/textfield/lib.php
--- 2/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@@ -320,4 -320,12 +320,12 @@@ class feedback_item_textfield extends f
      public function can_switch_require() {
          return true;
      }
 -    function clean_input_value($value) {
+ 
+     public function value_type() {
+         return PARAM_RAW;
+     }
+ 
++    public function clean_input_value($value) {
+         return s($value);
+     }
  }