q-edit - Add extra searches and a unit test.

Author: EJMFarrow

edit_stack_form.php

@@ -992,7 +992,7 @@ public function search_for_scripts($text) {
         if (!$text) {
             return false;
         }
-        return preg_match("/<\/jsxgraph>|\[\[jsxgraph|\[\[geogebra|<\/geogebra>|<script/i", $text);
+        return preg_match("/<\/jsxgraph>|\[\[jsxgraph|\[\[geogebra|<\/geogebra>|<script|\[\[javascript|\[\[script|<=|=>/i", $text);
     }
 
 }

tests/editform_test.php

@@ -76,6 +76,19 @@ public function __construct($questiontext, $specificfeedback, $quizmoduleid) {
         parent::__construct(new \moodle_url('/'), $fakequestion, $category, $contexts);
     }
 
+    /**
+     * Public override of parent function to allow access.
+     * @param mixed $field
+     * @param mixed $text
+     * @param mixed $format
+     * @param mixed $itemid
+     * @param mixed $filearea
+     * @return array
+     */
+    public function prepare_text_field($field, $text, $format, $itemid, $filearea = '') {
+        return parent::prepare_text_field($field, $text, $format, $itemid, $filearea);
+    }
+
 }
 
 /**
@@ -101,7 +114,7 @@ protected function get_form($questiontext, $specificfeedback) {
         return new editform_test_class($questiontext, $specificfeedback, $quizmoduleid);
     }
 
-    public function test_get_input_names_from_question_text_default(): void {
+    public function x_test_get_input_names_from_question_text_default(): void {
 
         $form = $this->get_form(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT,
                 \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK);
@@ -111,7 +124,7 @@ public function test_get_input_names_from_question_text_default(): void {
                 $qtype->get_input_names_from_question_text(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT));
     }
 
-    public function test_get_prt_names_from_question_default(): void {
+    public function x_test_get_prt_names_from_question_default(): void {
 
         $form = $this->get_form(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT,
                 \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK);
@@ -121,4 +134,43 @@ public function test_get_prt_names_from_question_default(): void {
                 $qtype->get_prt_names_from_question(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT,
                 \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK));
     }
+
+    public function test_text_format(): void {
+        $form = $this->get_form(\qtype_stack_edit_form::DEFAULT_QUESTION_TEXT,
+                \qtype_stack_edit_form::DEFAULT_SPECIFIC_FEEDBACK);
+        // No script. Leave format alone.
+        $data = $form->prepare_text_field('questiontext', 'hello', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_HTML, $data['format']);
+        // Scripts of different types. Set input to plain.
+        $data = $form->prepare_text_field('questiontext', 'hello<script>there</script>', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello[[javascript]]there[[/javascript]]', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello[[geogebra]]there[[/geogebra]]', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello<jsxgraph>there</jsxgraph>', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello[[jsxgraph]]there[[/jsxgraph]]', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello<geogebra>there</geogebra>', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello[[script]]there[[/script]]', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello<=there', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'hello=>there', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_PLAIN, $data['format']);
+        // No script. Leave format alone.
+        $data = $form->prepare_text_field('questiontext', '=hello>', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_HTML, $data['format']);
+        $data = $form->prepare_text_field('questiontext', 'script', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_HTML, $data['format']);
+        // Format already set to something other than HTML. Leave alone.
+        $data = $form->prepare_text_field('questiontext', 'hello<=there', FORMAT_MARKDOWN, 1);
+        $this->assertEquals(FORMAT_MARKDOWN, $data['format']);
+        // User editor preference set. Leave format alone.
+        set_user_preference('htmleditor', 'bob', null);
+        $data = $form->prepare_text_field('questiontext', 'hello<=there', FORMAT_HTML, 1);
+        $this->assertEquals(FORMAT_HTML, $data['format']);
+    }
 }