L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 9c96488ed9, reversing
changes made to b22884274f.
This commit is contained in:
Sam Hemelryk
2012-05-30 16:36:43 +12:00
parent 01ab2bb505
commit 24b464d9f7
12 changed files with 5 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/complete.php
+1 -2
View File
@@ -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);
mod/feedback/complete_guest.php
+2 -3
View File
@@ -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());
mod/feedback/item/captcha/lib.php
-9
View File
@@ -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);
}
}
mod/feedback/item/feedback_item_class.php
-9
View File
@@ -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){}
}
mod/feedback/item/info/lib.php
-9
View File
@@ -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);
}
}
mod/feedback/item/label/lib.php
-9
View File
@@ -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 '';
}
}
mod/feedback/item/multichoice/lib.php
+2 -18
View File
@@ -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);
}
}
mod/feedback/item/multichoicerated/lib.php
-8
View File
@@ -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);
}
}
mod/feedback/item/numeric/lib.php
-9
View File
@@ -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);
}
}
mod/feedback/item/textarea/lib.php
-9
View File
@@ -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);
}
}
mod/feedback/item/textfield/lib.php
-9
View File
@@ -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);
}
}
mod/feedback/lib.php
-12
View File
@@ -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.