Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"

This reverts commit a09a9be81210a29a0c093ff34dc5685c86b84022, reversing
changes made to 08e0aaa1733489cee61b1c48e166a98ada4477cb.

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index e4c202c..7fee641 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -507,8 +507,11 @@ if ($feedback_can_submit) {
                 //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);
+                    if (isset($formdata->{$frmvaluename})) {
+                        $value = $formdata->{$frmvaluename};
+                    } else {
+                        $value = null;
+                    }
                 } else {
                     if (isset($feedbackcompletedtmp->id)) {
                         $value = feedback_get_item_value($feedbackcompletedtmp->id,
@@ -527,7 +530,6 @@ if ($feedback_can_submit) {
                     feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
                     echo $OUTPUT->box_end();
                 }
-
                 echo $OUTPUT->box_end();
 
                 $lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak)

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index b472c09..25747a9 100644 (file)
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -72,7 +72,7 @@ if (isset($formdata->sesskey) AND
    !isset($formdata->gonextpage) AND
    !isset($formdata->gopreviouspage)) {
 
-    $gopage = (int) $formdata->lastpage;
+    $gopage = $formdata->lastpage;
 }
 if (isset($formdata->savevalues)) {
     $savevalues = true;
@@ -441,10 +441,13 @@ if ($feedback_can_submit) {
                 echo $OUTPUT->box_start('feedback_item_box_'.$align.$dependstyle);
                 $value = '';
                 //get the value
-                $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;
+                $frmvaluename = $feedbackitem->typ.'_'.$feedbackitem->id;
                 if (isset($savereturn)) {
-                    $value = isset($formdata->{$frmvaluename}) ? $formdata->{$frmvaluename} : null;
-                    $value = feedback_clean_input_value($feedbackitem, $value);
+                    if (isset($formdata->{$frmvaluename})) {
+                        $value = $formdata->{$frmvaluename};
+                    } else {
+                        $value = null;
+                    }
                 } else {
                     if (isset($feedbackcompletedtmp->id)) {
                         $value = feedback_get_item_value($feedbackcompletedtmp->id,
@@ -463,7 +466,6 @@ if ($feedback_can_submit) {
                     feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
                     echo $OUTPUT->box_end();
                 }
-
                 echo $OUTPUT->box_end();
 
                 $lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak)

diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php
index 19fa17b..126d51e 100644 (file)
--- a/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@ -326,13 +326,4 @@ class feedback_item_captcha extends feedback_item_base {
     public 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 57f1d6d..981aefd 100644 (file)
--- a/mod/feedback/item/feedback_item_class.php
+++ b/mod/feedback/item/feedback_item_class.php
@@ -128,14 +128,6 @@ abstract class feedback_item_base {
      */
     abstract public 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
@@ -183,7 +175,7 @@ class feedback_item_pagebreak extends feedback_item_base {
     }
     public function can_switch_require() {
     }
-    public function clean_input_value($value) {
-    }
 
-}
\ No newline at end of file
+}
+
+

diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php
index b58123f..299fef2 100644 (file)
--- a/mod/feedback/item/info/lib.php
+++ b/mod/feedback/item/info/lib.php
@@ -388,13 +388,4 @@ class feedback_item_info extends feedback_item_base {
     public 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 bd88d39..25c62a9 100644 (file)
--- a/mod/feedback/item/label/lib.php
+++ b/mod/feedback/item/label/lib.php
@@ -270,12 +270,4 @@ class feedback_item_label extends feedback_item_base {
     }
     public 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 d48abbe..cfba141 100644 (file)
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -826,13 +826,4 @@ class feedback_item_multichoice extends feedback_item_base {
     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 47ecedb..031f7b8 100644 (file)
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -678,12 +678,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 eb2b720..2369413 100644 (file)
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -534,13 +534,4 @@ class feedback_item_numeric extends feedback_item_base {
     public 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 8ed9370..54df5e6 100644 (file)
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -333,13 +333,4 @@ class feedback_item_textarea extends feedback_item_base {
     public 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 c9a4dc6..4051ffb 100644 (file)
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -320,13 +320,4 @@ class feedback_item_textfield extends feedback_item_base {
     public 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 e007c4e..3c9809b 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -2058,18 +2058,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.