Minor - Format code

main/exercice/multiple_answer_combination.class.php

@@ -37,15 +37,9 @@ class MultipleAnswerCombination extends Question
         $obj_ex = $_SESSION['objExercise'];
         $html = '<table class="data_table">
 					<tr style="text-align: center;">
-						<th width="10px">
+						<th width="10px">' . get_lang('Number') . '</th>
-							'.get_lang('Number').'
+						<th width="10px">' . get_lang('True') . '</th>
-						</th>
+						<th width="50%">' . get_lang('Answer') . '</th>';
-						<th width="10px">
-							'.get_lang('True').'
-						</th>
-						<th width="50%">
-							'.get_lang('Answer').'
-						</th>';
         // show column comment when feedback is enable
         $html .='<th>' . get_lang('Comment') . '</th>';
         $html .= '</tr>';
@@ -54,6 +48,7 @@ class MultipleAnswerCombination extends Question
         $defaults = array();
         $correct = 0;
         $answer = false;
+
         if (!empty($this->id)) {
             $answer = new Answer($this->id);
             $answer->read();
@@ -86,28 +81,59 @@ class MultipleAnswerCombination extends Question
                 $defaults['comment[2]'] = get_lang('DefaultMultipleComment1');
                 $defaults['correct[2]'] = false;
             }
+
             $renderer = & $form->defaultRenderer();
 
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
+            $renderer->setElementTemplate(
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
+                'correct[' . $i . ']'
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'counter[' . $i . ']'
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'answer[' . $i . ']'
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'comment[' . $i . ']'
+            );
 
             $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
             $answer_number->freeze();
 
-			$form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox" style="margin-left: 0em;"');
+			$form->addElement('checkbox',
+                'correct[' . $i . ']',
+                null,
+                null,
+                'class="checkbox" style="margin-left: 0em;"'
+            );
 			$boxes_names[] = 'correct[' . $i . ']';
 
-			$form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+			$form->addElement(
+                'html_editor',
+                'answer[' . $i . ']',
+                null,
+                array(),
+                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
+            );
 			$form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
 
-            $form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addElement(
+                'html_editor',
+                'comment[' . $i . ']',
+                null,
+                array(),
+                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
+            );
             //only 1 answer the all deal ...
             //$form->addElement('text', 'weighting['.$i.']',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"');
 
             $form->addElement('html', '</tr>');
         }
+
         $form->addElement('html', '</table>');
         $form->addElement('html', '<br />');
 
@@ -117,16 +143,15 @@ class MultipleAnswerCombination extends Question
         $form->addElement('text', 'weighting[1]', get_lang('Score'), array('class' => "span1", 'value' => '10'));
 
         $navigator_info = api_get_navigator();
+
         global $text, $class;
         //ie6 fix
         if ($obj_ex->edit_exercise_in_lp == true) {
             if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
-
                 $form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
                 $form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
                 $form->addElement('submit', 'submitQuestion', $text, 'class="' . $class . '"');
             } else {
-
                 $form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
                 $form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
                 $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
@@ -139,6 +164,7 @@ class MultipleAnswerCombination extends Question
         $renderer->setElementTemplate('{element}&nbsp;', 'moreAnswers');
         $form->addElement('html', '</div></div>');
         $defaults['correct'] = $correct;
+
         if (!empty($this->id)) {
             $form->setDefaults($defaults);
         } else {
@@ -146,10 +172,10 @@ class MultipleAnswerCombination extends Question
                 $form->setDefaults($defaults);
             }
         }
+
         $form->setConstants(array('nb_answers' => $nb_answers));
     }
 
-
     /**
 	 * abstract function which creates the form to create / edit the answers of the question
 	 * @param the formvalidator instance