moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-6386/MDL-6462 - yet more special character issues with multianswer. I think I have got them all this time. Backported from HEAD.

Browse source
This commit is contained in:
tjhunt 2007-03-20 14:31:16 +00:00
parent 900022293b
commit 1043fa2dff
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
question/type/multianswer/questiontype.php
View file

@ -232,7 +232,7 @@ class embedded_cloze_qtype extends default_questiontype {
$inputname = $nameprefix.$positionkey; $inputname = $nameprefix.$positionkey;
if (isset($state->responses[$positionkey])) { if (isset($state->responses[$positionkey])) {
$response = stripslashes($state->responses[$positionkey]); $response = $state->responses[$positionkey];
} else { } else {
$response = null; $response = null;
} }
@ -273,7 +273,7 @@ class embedded_cloze_qtype extends default_questiontype {
} }
if (!empty($chosenanswer->feedback)) { if (!empty($chosenanswer->feedback)) {
$feedback = str_replace("'", "\\'", $chosenanswer->feedback); $feedback = s(str_replace(array("\\", "'"), array("\\\\", "\\'"), $chosenanswer->feedback));
$popup = " onmouseover=\"return overlib('$feedback', STICKY, MOUSEOFF, CAPTION, '$strfeedback', FGCOLOR, '#FFFFFF');\" ". $popup = " onmouseover=\"return overlib('$feedback', STICKY, MOUSEOFF, CAPTION, '$strfeedback', FGCOLOR, '#FFFFFF');\" ".
" onmouseout=\"return nd();\" "; " onmouseout=\"return nd();\" ";
} }
@ -293,7 +293,7 @@ class embedded_cloze_qtype extends default_questiontype {
case 'shortanswer': case 'shortanswer':
case 'numerical': case 'numerical':
echo " <input $style $readonly $popup name=\"$inputname\" echo " <input $style $readonly $popup name=\"$inputname\"
type=\"text\" value=\"".s($response)."\" size=\"12\" /> "; type=\"text\" value=\"".s($response, true)."\" size=\"12\" /> ";
if (!empty($feedback) && !empty($USER->screenreader)) { if (!empty($feedback) && !empty($USER->screenreader)) {
echo "<img src=\"$CFG->pixpath/i/feedback.gif\" alt=\"$feedback\" />"; echo "<img src=\"$CFG->pixpath/i/feedback.gif\" alt=\"$feedback\" />";
} }
@ -304,7 +304,7 @@ class embedded_cloze_qtype extends default_questiontype {
foreach ($answers as $mcanswer) { foreach ($answers as $mcanswer) {
$selected = $response == $mcanswer->id $selected = $response == $mcanswer->id
? ' selected="selected" ' : ''; ? ' selected="selected" ' : '';
$outputoptions .= "<option value=\"$mcanswer->id\" $selected>$mcanswer->answer</option>"; $outputoptions .= '<option value="' . $mcanswer->id . '" $selected>' . s($mcanswer->answer, true) . '</option>';
} }
// In the next line, $readonly is invalid HTML, but it works in // In the next line, $readonly is invalid HTML, but it works in
// all browsers. $disabled would be valid, but then the JS for // all browsers. $disabled would be valid, but then the JS for
@ -340,7 +340,7 @@ class embedded_cloze_qtype extends default_questiontype {
$teststate = clone($state); $teststate = clone($state);
$state->raw_grade = 0; $state->raw_grade = 0;
foreach($question->options->questions as $key => $wrapped) { foreach($question->options->questions as $key => $wrapped) {
$state->responses[$key] = html_entity_decode($state->responses[$key]); $state->responses[$key] = $state->responses[$key];
$teststate->responses = array('' => $state->responses[$key]); $teststate->responses = array('' => $state->responses[$key]);
$teststate->raw_grade = 0; $teststate->raw_grade = 0;
if (false === $QTYPES[$wrapped->qtype] if (false === $QTYPES[$wrapped->qtype]
@ -646,7 +646,6 @@ define("ANSWER_REGEX_ANSWER_TYPE_SHORTANSWER", 5);
define("ANSWER_REGEX_ALTERNATIVES", 6); define("ANSWER_REGEX_ALTERNATIVES", 6);
function qtype_multianswer_extract_question($text) { function qtype_multianswer_extract_question($text) {
$question = new stdClass; $question = new stdClass;
$question->qtype = 'multianswer'; $question->qtype = 'multianswer';
$question->questiontext = $text; $question->questiontext = $text;
@ -697,7 +696,7 @@ function qtype_multianswer_extract_question($text) {
$wrapped->fraction[] = '0'; $wrapped->fraction[] = '0';
} }
if (isset($altregs[ANSWER_ALTERNATIVE_REGEX_FEEDBACK])) { if (isset($altregs[ANSWER_ALTERNATIVE_REGEX_FEEDBACK])) {
$wrapped->feedback[] = $altregs[ANSWER_ALTERNATIVE_REGEX_FEEDBACK]; $wrapped->feedback[] = html_entity_decode($altregs[ANSWER_ALTERNATIVE_REGEX_FEEDBACK], ENT_QUOTES, 'UTF-8');
} else { } else {
$wrapped->feedback[] = ''; $wrapped->feedback[] = '';
} }
@ -711,7 +710,8 @@ function qtype_multianswer_extract_question($text) {
$wrapped->tolerance[] = 0; $wrapped->tolerance[] = 0;
} }
} else { // Tolerance can stay undefined for non numerical questions } else { // Tolerance can stay undefined for non numerical questions
$wrapped->answer[] = $altregs[ANSWER_ALTERNATIVE_REGEX_ANSWER]; // Undo quoting done by the HTML editor.
$wrapped->answer[] = html_entity_decode($altregs[ANSWER_ALTERNATIVE_REGEX_ANSWER], ENT_QUOTES, 'UTF-8');
} }
$tmp = explode($altregs[0], $remainingalts, 2); $tmp = explode($altregs[0], $remainingalts, 2);
$remainingalts = $tmp[1]; $remainingalts = $tmp[1];

2
question/type/questiontype.php
View file

@ -433,7 +433,7 @@ class default_questiontype {
if ($question->options->answers) { if ($question->options->answers) {
foreach ($question->options->answers as $answer) { foreach ($question->options->answers as $answer) {
if (((int) $answer->fraction) === 1) { if (((int) $answer->fraction) === 1) {
return array('' => $answer->answer); return array('' => addslashes($answer->answer));
} }
} }
} }