From: gustav_delius <gustav_delius>
Date: Sun, 19 Mar 2006 19:49:37 +0000 (+0000)
Subject: Teacher-provided text is now printed without cleaning.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7347c60b52dcf8ac3b73f548af93c61037401893;p=moodle.git

Teacher-provided text is now printed without cleaning.
---

diff --git a/question/editlib.php b/question/editlib.php
index 8eac65f4a0..57aff6c0ca 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -134,7 +134,8 @@ function question_list($course, $categoryid, $quizid,
         return;
     }
     echo "<center>";
-    echo format_text($category->info, FORMAT_MOODLE);
+    $formatoptions->noclean = true;
+    echo format_text($category->info, FORMAT_MOODLE, $formatoptions, $course->id);
 
     echo '<table><tr>';
 
diff --git a/question/questiontypes/description/questiontype.php b/question/questiontypes/description/questiontype.php
index 049ea3a584..eec8bbc153 100644
--- a/question/questiontypes/description/questiontype.php
+++ b/question/questiontypes/description/questiontype.php
@@ -38,9 +38,12 @@ class quiz_description_qtype extends quiz_default_questiontype {
             $editlink = link_to_popup_window('/question/question.php?id='.$question->id, $stredit, $linktext, 450, 550, $stredit, '', true);
         }
 
+        $formatoptions->noclean = true;
+        $formatoptions->para = false;
+
         $questiontext = format_text($question->questiontext,
                          $question->questiontextformat,
-                         NULL, $cmoptions->course);
+                         $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
 
         include "$CFG->dirroot/question/questiontypes/description/question.html";
diff --git a/question/questiontypes/essay/questiontype.php b/question/questiontypes/essay/questiontype.php
index e4e0b551be..e641ecc4ee 100644
--- a/question/questiontypes/essay/questiontype.php
+++ b/question/questiontypes/essay/questiontype.php
@@ -84,12 +84,14 @@ class question_essay_qtype extends quiz_default_questiontype {
         $answers = &$question->options->answers;
         //$correctanswers = $this->get_correct_responses($question, $state);  // no correct answers ;)
         $readonly = empty($options->readonly) ? '' : 'disabled="disabled"';
+        $formatoptions->noclean = true;
+        $formatoptions->para = false;
         $nameprefix = $question->name_prefix;
         
         /// Print question text and media
        echo format_text($question->questiontext,
                          $question->questiontextformat,
-                         NULL, $cmoptions->course);
+                         $formatoptions, $cmoptions->course);
                          
         echo get_question_image($question, $cmoptions->course);
 
@@ -156,7 +158,7 @@ class question_essay_qtype extends quiz_default_questiontype {
             if (empty($value)) {  // no comment yet
                 echo format_text(get_string('nocommentsyet', 'quiz'));
             } else {
-                echo format_text($value);    
+                echo format_text($value, '', $formatoptions, $cmoptions->course);    
             }
             echo '</div></p>';
         }
@@ -164,7 +166,7 @@ class question_essay_qtype extends quiz_default_questiontype {
         // feedback
         if ($options->feedback) {
             foreach ($answers as $answer) {
-                format_text("<p align=\"right\">$answer->feedback</p>");
+                format_text("<p align=\"right\">$answer->feedback</p>", '', $formatoptions, $cmoptions->course);
             }
         }
         $this->print_question_submit_buttons($question, $state, $cmoptions, $options);
diff --git a/question/questiontypes/match/questiontype.php b/question/questiontypes/match/questiontype.php
index 623c120683..29045ceb66 100644
--- a/question/questiontypes/match/questiontype.php
+++ b/question/questiontypes/match/questiontype.php
@@ -218,6 +218,8 @@ class question_match_qtype extends quiz_default_questiontype {
         $answers        = array();
         $responses      = &$state->responses;
 
+        $formatoptions->noclean = true;
+        $formatoptions->para = false;
 
         foreach ($subquestions as $subquestion) {
             foreach ($subquestion->options->answers as $ans) {
@@ -231,7 +233,7 @@ class question_match_qtype extends quiz_default_questiontype {
         // Print formulation
         $questiontext = format_text($question->questiontext,
                          $question->questiontextformat,
-                         NULL, $cmoptions->course);
+                         $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
 
         ///// Print the input controls //////
@@ -240,7 +242,7 @@ class question_match_qtype extends quiz_default_questiontype {
 
             /// Subquestion text:
             $a->text = format_text($subquestion->questiontext,
-                $question->questiontextformat, NULL, $cmoptions->course);
+                $question->questiontextformat, $formatoptions, $cmoptions->course);
 
             /// Drop-down list:
             $menuname = $nameprefix.$subquestion->id;
diff --git a/question/questiontypes/multianswer/questiontype.php b/question/questiontypes/multianswer/questiontype.php
index 2f9d572d78..f4e08373b0 100644
--- a/question/questiontypes/multianswer/questiontype.php
+++ b/question/questiontypes/multianswer/questiontype.php
@@ -195,6 +195,8 @@ class quiz_embedded_cloze_qtype extends quiz_default_questiontype {
     function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) {
         global $QTYPES;
         $readonly = empty($options->readonly) ? '' : 'readonly="readonly"';
+        $formatoptions->noclean = true;
+        $formatoptions->para = false;
         $nameprefix = $question->name_prefix;
 
         // For this question type, we better print the image on top:
@@ -202,7 +204,7 @@ class quiz_embedded_cloze_qtype extends quiz_default_questiontype {
 
         $qtextremaining = format_text($question->questiontext,
                                       $question->questiontextformat,
-                                      NULL, $cmoptions->course);
+                                      $formatoptions, $cmoptions->course);
 
         $strfeedback = get_string('feedback', 'quiz');
 
diff --git a/question/questiontypes/multichoice/questiontype.php b/question/questiontypes/multichoice/questiontype.php
index 43a964171e..a0476f17e2 100644
--- a/question/questiontypes/multichoice/questiontype.php
+++ b/question/questiontypes/multichoice/questiontype.php
@@ -261,12 +261,13 @@ class question_multichoice_qtype extends quiz_default_questiontype {
         $readonly = empty($options->readonly) ? '' : 'readonly="readonly"';
 
         $formatoptions = new stdClass;
+        $formatoptions->noclean = true;
         $formatoptions->para = false;
 
         // Print formulation
         $questiontext = format_text($question->questiontext,
                          $question->questiontextformat,
-                         NULL, $cmoptions->course);
+                         $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
         $answerprompt = ($question->options->single) ? get_string('singleanswer', 'quiz') :
             get_string('multipleanswers', 'quiz');
@@ -305,11 +306,11 @@ class question_multichoice_qtype extends quiz_default_questiontype {
                 'highlight' : '';
 
             // Print the answer text
-            $a->text = format_text("$qnumchar. $answer->answer", FORMAT_MOODLE, $formatoptions);
+            $a->text = format_text("$qnumchar. $answer->answer", FORMAT_MOODLE, $formatoptions, $cmoptions->course);
 
             // Print feedback if feedback is on
             $a->feedback = (($options->feedback || $options->correct_responses) && $checked) ?
-               $feedback = format_text($answer->feedback, true, false) : '';
+               $feedback = format_text($answer->feedback, true, $formatoptions, $cmoptions->course) : '';
 
             $anss[] = clone($a);
         }
diff --git a/question/questiontypes/shortanswer/questiontype.php b/question/questiontypes/shortanswer/questiontype.php
index d8d9f83dc0..d20b31f44f 100644
--- a/question/questiontypes/shortanswer/questiontype.php
+++ b/question/questiontypes/shortanswer/questiontype.php
@@ -124,13 +124,15 @@ class question_shortanswer_qtype extends quiz_default_questiontype {
         $answers = &$question->options->answers;
         $correctanswers = $this->get_correct_responses($question, $state);
         $readonly = empty($options->readonly) ? '' : 'readonly="readonly"';
+        $formatoptions->noclean = true;
+        $formatoptions->para = false;
         $nameprefix = $question->name_prefix;
 
         /// Print question text and media
 
         $questiontext =  format_text($question->questiontext,
                          $question->questiontextformat,
-                         NULL, $cmoptions->course);
+                         $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
 
         /// Print input controls
@@ -146,7 +148,7 @@ class question_shortanswer_qtype extends quiz_default_questiontype {
         if ($options->feedback) {
             foreach($answers as $answer) {
                 if($answer->feedback and $this->test_response($question, $state, $answer)) {
-                    $feedback = format_text($answer->feedback, true, false);
+                    $feedback = format_text($answer->feedback, true, $formatoptions, $cmoptions->course);
                     break;
                 }
             }
diff --git a/question/questiontypes/truefalse/questiontype.php b/question/questiontypes/truefalse/questiontype.php
index e7cc30671f..07775d1cc6 100644
--- a/question/questiontypes/truefalse/questiontype.php
+++ b/question/questiontypes/truefalse/questiontype.php
@@ -138,11 +138,13 @@ class question_truefalse_qtype extends quiz_default_questiontype {
         global $CFG;
 
         $readonly = $options->readonly ? ' readonly="readonly"' : '';
+        $formatoptions->noclean = true;
+        $formatoptions->para = false;
 
         // Print question formulation
         $questiontext = format_text($question->questiontext,
                          $question->questiontextformat,
-                         NULL, $cmoptions->course);
+                         $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
 
         $answers = &$question->options->answers;
@@ -179,7 +181,7 @@ class question_truefalse_qtype extends quiz_default_questiontype {
         $feedback = '';
         if ($options->feedback and isset($answers[$state->responses['']])) {
             $chosenanswer = $answers[$state->responses['']];
-            $feedback = format_text($chosenanswer->feedback, true, false);
+            $feedback = format_text($chosenanswer->feedback, true, $formatoptions, $cmoptions->course);
         }
         
         include("$CFG->dirroot/question/questiontypes/truefalse/display.html");