Skip to content

Commit

Permalink
MDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW.
Browse files Browse the repository at this point in the history
It turns out that you should almost never use PARAM_CLEANHTML.
  • Loading branch information
timhunt committed Feb 8, 2013
1 parent 6319737 commit 2d2018a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 5 additions & 1 deletion lib/moodlelib.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@
define('PARAM_CAPABILITY', 'capability');

/**
* PARAM_CLEANHTML - cleans submitted HTML code. use only for text in HTML format. This cleaning may fix xhtml strictness too.
* PARAM_CLEANHTML - cleans submitted HTML code. Note that you almost never want
* to use this. The normal mode of operation is to use PARAM_RAW when recieving
* the input (required/optional_param or formslib) and then sanitse the HTML
* using format_text on output. This is for the rare cases when you want to
* sanitise the HTML on input. This cleaning may also fix xhtml strictness.
*/
define('PARAM_CLEANHTML', 'cleanhtml');

Expand Down
6 changes: 3 additions & 3 deletions question/engine/questionattempt.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class question_attempt {
* @var string special value to indicate a response variable that is uploaded
* files.
*/
const PARAM_CLEANHTML_FILES = 'paramcleanhtmlfiles';
const PARAM_RAW_FILES = 'paramrawfiles';

/** @var integer if this attempts is stored in the question_attempts table, the id of that row. */
protected $id = null;
Expand Down Expand Up @@ -888,8 +888,8 @@ public function get_submitted_var($name, $type, $postdata = null) {
case self::PARAM_FILES:
return $this->process_response_files($name, $name, $postdata);

case self::PARAM_CLEANHTML_FILES:
$var = $this->get_submitted_var($name, PARAM_CLEANHTML, $postdata);
case self::PARAM_RAW_FILES:
$var = $this->get_submitted_var($name, PARAM_RAW, $postdata);
return $this->process_response_files($name, $name . ':itemid', $postdata, $var);

default:
Expand Down
4 changes: 1 addition & 3 deletions question/type/essay/question.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ public function get_format_renderer(moodle_page $page) {

public function get_expected_data() {
if ($this->responseformat == 'editorfilepicker') {
$expecteddata = array('answer' => question_attempt::PARAM_CLEANHTML_FILES);
} else if ($this->responseformat == 'editor') {
$expecteddata = array('answer' => PARAM_CLEANHTML);
$expecteddata = array('answer' => question_attempt::PARAM_RAW_FILES);
} else {
$expecteddata = array('answer' => PARAM_RAW);
}
Expand Down

0 comments on commit 2d2018a

Please sign in to comment.