MDL-29621 - XHTML not welformed when creating Feedback questions

diff --git a/mod/feedback/item/captcha/captcha_form.php b/mod/feedback/item/captcha/captcha_form.php
index 1bd7ab6..0761af6 100644 (file)
--- a/mod/feedback/item/captcha/captcha_form.php
+++ b/mod/feedback/item/captcha/captcha_form.php
@@ -16,8 +16,14 @@ class feedback_captcha_form extends feedback_item_form {
 
         $mform->addElement('header', 'general', get_string($this->type, 'feedback'));
         $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
 
         $mform->addElement('select',
                             'presentation',

diff --git a/mod/feedback/item/feedback_item_form_class.php b/mod/feedback/item/feedback_item_form_class.php
index baf53fb..d9cc8b2 100644 (file)
--- a/mod/feedback/item/feedback_item_form_class.php
+++ b/mod/feedback/item/feedback_item_form_class.php
@@ -31,7 +31,10 @@ abstract class feedback_item_form extends moodleform {
                                 $common['items']
                                 );
             $mform->addHelpButton('dependitem', 'depending', 'feedback');
-            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+            $mform->addElement('text',
+                                'dependvalue',
+                                get_string('dependvalue', 'feedback'),
+                                array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
         }else {
             $mform->addElement('hidden', 'dependitem', 0);
             $mform->setType('dependitem', PARAM_INT);

diff --git a/mod/feedback/item/info/info_form.php b/mod/feedback/item/info/info_form.php
index 47e7ad9..8b20573 100644 (file)
--- a/mod/feedback/item/info/info_form.php
+++ b/mod/feedback/item/info/info_form.php
@@ -18,8 +18,14 @@ class feedback_info_form extends feedback_item_form {
         $mform->addElement('hidden', 'required', 0);
         $mform->setType('required', PARAM_INT);
 
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
 
         $options=array();
         $options[1]  = get_string('responsetime', 'feedback');

diff --git a/mod/feedback/item/multichoice/multichoice_form.php b/mod/feedback/item/multichoice/multichoice_form.php
index 7a7731e..af87b1b 100644 (file)
--- a/mod/feedback/item/multichoice/multichoice_form.php
+++ b/mod/feedback/item/multichoice/multichoice_form.php
@@ -17,8 +17,14 @@ class feedback_multichoice_form extends feedback_item_form {
 
         $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
 
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
 
         $mform->addElement('select',
                             'horizontal',

diff --git a/mod/feedback/item/multichoicerated/multichoicerated_form.php b/mod/feedback/item/multichoicerated/multichoicerated_form.php
index abee301..327ca07 100644 (file)
--- a/mod/feedback/item/multichoicerated/multichoicerated_form.php
+++ b/mod/feedback/item/multichoicerated/multichoicerated_form.php
@@ -17,8 +17,14 @@ class feedback_multichoicerated_form extends feedback_item_form {
 
         $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
 
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
 
         $mform->addElement('select',
                             'horizontal',

diff --git a/mod/feedback/item/numeric/numeric_form.php b/mod/feedback/item/numeric/numeric_form.php
index d3776d0..0620ad1 100644 (file)
--- a/mod/feedback/item/numeric/numeric_form.php
+++ b/mod/feedback/item/numeric/numeric_form.php
@@ -17,12 +17,24 @@ class feedback_numeric_form extends feedback_item_form {
         $mform->addElement('header', 'general', get_string($this->type, 'feedback'));
         $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
 
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
-
-        $mform->addElement('text', 'rangefrom', get_string('numeric_range_from', 'feedback'), array('size="10"','maxlength="10"'));
-
-        $mform->addElement('text', 'rangeto', get_string('numeric_range_to', 'feedback'), array('size="10"','maxlength="10"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
+
+        $mform->addElement('text',
+                            'rangefrom',
+                            get_string('numeric_range_from', 'feedback'),
+                            array('size'=>10, 'maxlength'=>10));
+
+        $mform->addElement('text',
+                            'rangeto',
+                            get_string('numeric_range_to', 'feedback'),
+                            array('size'=>10,'maxlength'=>10));
 
         parent::definition();
         $this->set_data($item);

diff --git a/mod/feedback/item/textarea/textarea_form.php b/mod/feedback/item/textarea/textarea_form.php
index 677c170..dae4abb 100644 (file)
--- a/mod/feedback/item/textarea/textarea_form.php
+++ b/mod/feedback/item/textarea/textarea_form.php
@@ -16,8 +16,14 @@ class feedback_textarea_form extends feedback_item_form {
         $mform->addElement('header', 'general', get_string($this->type, 'feedback'));
         $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
 
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
 
         $mform->addElement('select',
                             'itemwidth',

diff --git a/mod/feedback/item/textfield/textfield_form.php b/mod/feedback/item/textfield/textfield_form.php
index 4f9fbc4..e70d34a 100644 (file)
--- a/mod/feedback/item/textfield/textfield_form.php
+++ b/mod/feedback/item/textfield/textfield_form.php
@@ -16,8 +16,14 @@ class feedback_textfield_form extends feedback_item_form {
         $mform->addElement('header', 'general', get_string($this->type, 'feedback'));
         $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
 
-        $mform->addElement('text', 'name', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
-        $mform->addElement('text', 'label', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $mform->addElement('text',
+                            'name',
+                            get_string('item_name', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_NAME_TEXTBOX_SIZE, 'maxlength'=>255));
+        $mform->addElement('text',
+                            'label',
+                            get_string('item_label', 'feedback'),
+                            array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
 
         $mform->addElement('select',
                             'itemsize',