chamilo / chamilo-lms

main/exercice/hotspot_lang_conversion.php

Spacing +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@ 
 
 $hotspot_lang_file = api_get_path(SYS_LANG_PATH);
 
-if(isset($_GET['lang'])) {
+if (isset($_GET['lang'])) {
 	//$search = array('../','\\0','\\');
 	$lang = urldecode($_GET['lang']);
 	if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) {
 		//$lang = str_replace($search,$replace,urldecode($_GET['lang']));
-		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php'))
-			$hotspot_lang_file .= $lang . '/hotspot.inc.php';
+		if (file_exists($hotspot_lang_file.$lang.'/hotspot.inc.php'))
+			$hotspot_lang_file .= $lang.'/hotspot.inc.php';
 		else
 			$hotspot_lang_file .= 'english/hotspot.inc.php';
 	} else {
@@ -33,25 +33,25 @@ 
 
 $temp = array();
 
-foreach($file as $value)
+foreach ($file as $value)
 {
 	$explode = explode('=', $value);
 
-	if(count($explode) > 1)
+	if (count($explode) > 1)
 	{
 		$explode[0] = trim($explode[0]);
-		$explode[0] = '&' . substr($explode[0], 1, strlen($explode[0]));
+		$explode[0] = '&'.substr($explode[0], 1, strlen($explode[0]));
 
 		$explode[1] = trim($explode[1]);
 		$explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1);
 		$explode[1] = str_replace('"', '', $explode[1]);
 
-		$temp[] = $explode[0] . '=' . $explode[1];
+		$temp[] = $explode[0].'='.$explode[1];
 	}
 }
 
-foreach($temp as $value)
+foreach ($temp as $value)
 {
-	echo $value . ' ';
+	echo $value.' ';
 }
 ?>

main/exercice/stats.php

Spacing +16 added lines, -16 removed lines

@@ -61,13 +61,13 @@ 
         $data[$question_id]['type'] = $question_obj->get_question_type_name();
         $percentange = 0;
         if ($count_students) {
-            $percentange = $count_users / $count_students*100;
+            $percentange = $count_users / $count_students * 100;
         }
 
         $data[$question_id]['students_who_try_exercise'] = Display::bar_progress(
             $percentange,
             false,
-            $count_users .' / '.$count_students
+            $count_users.' / '.$count_students
         );
         $data[$question_id]['lowest_score'] = round($exercise_stats['min'], 2);
         $data[$question_id]['average_score'] = round($exercise_stats['average'], 2);
@@ -142,23 +142,23 @@ 
                         } else {
                             $data[$id]['name'] = '-';
                         }
-                        $data[$id]['answer'] 	= $answer_item;
+                        $data[$id]['answer'] = $answer_item;
 
                         $answer_item = api_substr($answer_item, 1);
-                        $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) -1);
+                        $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) - 1);
                         
-                        $data[$id]['answer'] 	= $answer_item;
+                        $data[$id]['answer'] = $answer_item;
 
-                        $data[$id]['correct'] 	= '-';
+                        $data[$id]['correct'] = '-';
 
                         $count = ExerciseLib::getNumberStudentsFillBlanksAnwserCount($question_id, $exercise_id);
                         $count = $count[$counter];
                         
                         $percentange = 0;
                         if (!empty($count_students)) {
-                            $percentange = $count/$count_students*100;
+                            $percentange = $count / $count_students * 100;
                         }
-                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
                         $id++;
                         $counter++;
                     }
@@ -194,9 +194,9 @@ 
                         );
                         $percentange = 0;
                         if (!empty($count_students)) {
-                            $percentange = $count/$count_students*100;
+                            $percentange = $count / $count_students * 100;
                         }
-                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
                     }
                     break;
                 case HOT_SPOT:
@@ -217,9 +217,9 @@ 
                     );
                     $percentange = 0;
                     if (!empty($count_students)) {
-                        $percentange = $count/$count_students*100;
+                        $percentange = $count / $count_students * 100;
                     }
-                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
                     break;
                 default:
                     if ($answer_id == 1) {
@@ -239,9 +239,9 @@ 
                     );
                     $percentange = 0;
                     if (!empty($count_students)) {
-                        $percentange = $count/$count_students*100;
+                        $percentange = $count / $count_students * 100;
                     }
-                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
             }
             $id++;
         }
@@ -273,8 +273,8 @@ 
 $interbreadcrumb[] = array("url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(), "name" => $objExercise->name);
 
 $tpl = new Template(get_lang('ReportByQuestion'));
-$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' .
-    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'.
+    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
 $actions = Display::div($actions, array('class'=> 'actions'));
 $content = $actions.$content;
 $tpl->assign('content', $content);

main/exercice/qti2.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 }
 
 // the breadcrumbs
-$interbreadcrumb[]= array (
+$interbreadcrumb[] = array(
     "url" => api_get_path(WEB_CODE_PATH)."exercice/exercise.php?".api_get_cidreq(),
     "name" => get_lang('Exercises')
 );

main/exercice/multiple_answer_true_false.class.php

Spacing +30 added lines, -30 removed lines

@@ -44,14 +44,14 @@ 
         $html = '<table class="table table-striped table-hover">';
         $html .= '<thead>';
         $html .= '<tr>';
-        $html .= '<th>' . get_lang('Number') . '</th>';
-        $html .= '<th>' . get_lang('True') . '</th>';
-        $html .= '<th>' . get_lang('False') . '</th>';
-        $html .= '<th>' . get_lang('Answer') . '</th>';
+        $html .= '<th>'.get_lang('Number').'</th>';
+        $html .= '<th>'.get_lang('True').'</th>';
+        $html .= '<th>'.get_lang('False').'</th>';
+        $html .= '<th>'.get_lang('Answer').'</th>';
 
         // show column comment when feedback is enable
         if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
-            $html .= '<th>' . get_lang('Comment') . '</th>';
+            $html .= '<th>'.get_lang('Comment').'</th>';
         }
 
         $html .= '</tr>';
@@ -89,19 +89,19 @@ 
 
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'correct[' . $i . ']'
+                'correct['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
 
             $answer_number = $form->addElement(
@@ -114,15 +114,15 @@ 
             $answer_number->freeze();
 
             if (is_object($answer)) {
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
                 $correct = $answer->correct[$i];
-                $defaults['correct[' . $i . ']'] = $correct;
+                $defaults['correct['.$i.']'] = $correct;
 
                 $j = 1;
                 if (!empty($optionData)) {
                     foreach ($optionData as $id => $data) {
-                        $form->addElement('radio', 'correct[' . $i . ']', null, null, $id);
+                        $form->addElement('radio', 'correct['.$i.']', null, null, $id);
                         $j++;
                         if ($j == 3) {
                             break;
@@ -130,15 +130,15 @@ 
                     }
                 }
             } else {
-                $form->addElement('radio', 'correct[' . $i . ']', null, null, 1);
-                $form->addElement('radio', 'correct[' . $i . ']', null, null, 2);
+                $form->addElement('radio', 'correct['.$i.']', null, null, 1);
+                $form->addElement('radio', 'correct['.$i.']', null, null, 2);
 
-                $defaults['answer[' . $i . ']'] = '';
-                $defaults['comment[' . $i . ']'] = '';
-                $defaults['correct[' . $i . ']'] = '';
+                $defaults['answer['.$i.']'] = '';
+                $defaults['comment['.$i.']'] = '';
+                $defaults['correct['.$i.']'] = '';
             }
 
-            $boxes_names[] = 'correct[' . $i . ']';
+            $boxes_names[] = 'correct['.$i.']';
 
             $form->addHtmlEditor(
                 "answer[$i]",
@@ -152,7 +152,7 @@ 
             if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 $form->addElement(
                     'html_editor',
-                    'comment[' . $i . ']',
+                    'comment['.$i.']',
                     null,
                     array(),
                     array(
@@ -170,22 +170,22 @@ 
 
         $correctInputTemplate = '<div class="form-group">';
         $correctInputTemplate .= '<label class="col-sm-2 control-label">';
-        $correctInputTemplate .= '<span class="form_required">*</span>' . get_lang('Score');
+        $correctInputTemplate .= '<span class="form_required">*</span>'.get_lang('Score');
         $correctInputTemplate .= '</label>';
         $correctInputTemplate .= '<div class="col-sm-8">';
         $correctInputTemplate .= '<table>';
         $correctInputTemplate .= '<tr>';
         $correctInputTemplate .= '<td>';
-        $correctInputTemplate .= get_lang('Correct') . '{element}';
+        $correctInputTemplate .= get_lang('Correct').'{element}';
         $correctInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->';
         $correctInputTemplate .= '</td>';
 
         $wrongInputTemplate = '<td>';
-        $wrongInputTemplate .= get_lang('Wrong') . '{element}';
+        $wrongInputTemplate .= get_lang('Wrong').'{element}';
         $wrongInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->';
         $wrongInputTemplate .= '</td>';
 
-        $doubtScoreInputTemplate = '<td>' . get_lang('DoubtScore') . '<br>{element}';
+        $doubtScoreInputTemplate = '<td>'.get_lang('DoubtScore').'<br>{element}';
         $doubtScoreInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->';
         $doubtScoreInputTemplate .= '</td>';
         $doubtScoreInputTemplate .= '</tr>';
@@ -214,7 +214,7 @@ 
 
             if (!empty($scores)) {
                 for ($i = 1; $i <= 3; $i++) {
-                    $defaults['option[' . $i . ']'] = $scores[$i - 1];
+                    $defaults['option['.$i.']'] = $scores[$i - 1];
                 }
             }
         }
@@ -262,7 +262,7 @@ 
                 Question::updateQuestionOption($id, $optionData, $course_id);
             }
         } else {
-            for ($i=1 ; $i <= 3 ; $i++) {
+            for ($i = 1; $i <= 3; $i++) {
                 $last_id = Question::saveQuestionOption(
                     $this->id,
                     $this->options[$i],
@@ -287,9 +287,9 @@ 
         the true, false, doubt options registered in this format
         XX:YY:ZZZ where XX is a float score value.*/
         $extra_values = array();
-        for ($i=1 ; $i <= 3 ; $i++) {
+        for ($i = 1; $i <= 3; $i++) {
             $score = trim($form -> getSubmitValue('option['.$i.']'));
-            $extra_values[]= $score;
+            $extra_values[] = $score;
         }
         $this->setExtra(implode(':', $extra_values));
 
@@ -304,7 +304,7 @@ 
             }
     	    $questionWeighting += $extra_values[0]; //By default 0 has the correct answers
 
-        	$objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
+        	$objAnswer->createAnswer($answer, $goodAnswer, $comment, '', $i);
         }
 
     	// saves the answers into the data base
@@ -324,7 +324,7 @@ 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-  	    $header .= '<table class="'.$this->question_table_class .'">
+  	    $header .= '<table class="'.$this->question_table_class.'">
 		<tr>
 			<th>'.get_lang("Choice").'</th>
 			<th>'. get_lang("ExpectedChoice").'</th>

main/exercice/hotspot_save.inc.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 
 $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
 $questionId = intval($_GET['questionId']);
-$answerId 	= intval($_GET['answerId']);
+$answerId = intval($_GET['answerId']);
 
 if ($_GET['type'] == "square" || $_GET['type'] == "circle") {
 	$hotspot_type = $_GET['type'];
@@ -20,11 +20,11 @@ 
 }
 if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") {
 	$hotspot_type = $_GET['type'];
-	$tmp_coord = explode(",",$_GET['co']);
+	$tmp_coord = explode(",", $_GET['co']);
 	$i = 0;
 	$hotspot_coordinates = "";
 	foreach ($tmp_coord as $coord) {
-		if ($i%2 == 0) {
+		if ($i % 2 == 0) {
 			$delimiter = ";";
 		} else {
 			$delimiter = "|";
@@ -32,7 +32,7 @@ 
 		$hotspot_coordinates .= $coord.$delimiter;
 		$i++;
 	}
-	$hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
+	$hotspot_coordinates = api_substr($hotspot_coordinates, 0, -2);
 }
 $course_id = api_get_course_int_id();
 $sql = "UPDATE $TBL_ANSWER SET

main/exercice/question_list_admin.inc.php

Spacing +13 added lines, -14 removed lines

@@ -108,7 +108,7 @@ 
             .sortable({
                 cursor: "move", // works?
                 update: function(event, ui) {
-                    var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']);?>";
+                    var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']); ?>";
                     $.post("<?php echo $ajax_url ?>", order, function(reponse){
                         $("#message").html(reponse);
                     });
@@ -141,11 +141,11 @@ 
     echo "<div class='table-responsive'>";
     echo "<table class='table table-condensed'>";
     echo "<tr>";
-    echo "<th style=\"width: 50%;\">" .get_lang('Questions'). "</th>";
-    echo "<th style=\"width: 6%;\">" .get_lang('Type'). "</th>";
-    echo "<th style=\"width: 22%; text-align:center;\">" .get_lang('Category'). "</th>";
-    echo "<th style=\"width: 6%;\">" .get_lang('Difficulty'). "</th>";
-    echo "<th style=\"width: 16%; float:left;\">" .get_lang('Score'). "</th>";
+    echo "<th style=\"width: 50%;\">".get_lang('Questions')."</th>";
+    echo "<th style=\"width: 6%;\">".get_lang('Type')."</th>";
+    echo "<th style=\"width: 22%; text-align:center;\">".get_lang('Category')."</th>";
+    echo "<th style=\"width: 6%;\">".get_lang('Difficulty')."</th>";
+    echo "<th style=\"width: 16%; float:left;\">".get_lang('Score')."</th>";
     echo "</tr>";
     echo "</table>";
     echo "</div>";
@@ -172,15 +172,14 @@ 
                 $question_class = get_class($objQuestionTmp);
 
                 $clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.
-                    Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
+                    Display::return_icon('cd.gif', get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
                 $edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ?
                     '<a>'.Display::return_icon(
                         'edit_na.png',
                         get_lang('QuestionEditionNotAvailableBecauseItIsAlreadyAnsweredHoweverYouCanCopyItAndModifyTheCopy'),
                         array(),
                         ICON_SIZE_SMALL
-                    ).'</a>' :
-                    '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
+                    ).'</a>' : '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
                     $objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.
                     Display::return_icon(
                         'edit.png',
@@ -190,16 +189,16 @@ 
                     ).'</a>';
                 $delete_link = null;
                 if ($objExercise->edit_exercise_in_lp == true) {
-                    $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
+                    $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png', get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
                 }
 
-                $edit_link = Display::tag('div', $edit_link,   array('style'=>'float:left; padding:0px; margin:0px'));
-                $clone_link = Display::tag('div', $clone_link,  array('style'=>'float:left; padding:0px; margin:0px'));
+                $edit_link = Display::tag('div', $edit_link, array('style'=>'float:left; padding:0px; margin:0px'));
+                $clone_link = Display::tag('div', $clone_link, array('style'=>'float:left; padding:0px; margin:0px'));
                 $delete_link = Display::tag('div', $delete_link, array('style'=>'float:left; padding:0px; margin:0px'));
                 $actions = Display::tag(
                     'div',
                     $edit_link.$clone_link.$delete_link,
-                    array('class'=>'edition','style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;')
+                    array('class'=>'edition', 'style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;')
                 );
 
                 $title = Security::remove_XSS($objQuestionTmp->selectTitle());
@@ -248,7 +247,7 @@ 
                 echo $actions;
                 echo '</div>';
                 echo '<div class="question-list-description-block">';
-                echo '<p class="lead">' . get_lang($question_class) . '</p>';
+                echo '<p class="lead">'.get_lang($question_class).'</p>';
                 //echo get_lang('Level').': '.$objQuestionTmp->selectLevel();
                 ExerciseLib::showQuestion($id, false, null, null, false, true, false, true, $objExercise->feedback_type, true);
                 echo '</div>';

main/exercice/question_create.php

Spacing +7 added lines, -7 removed lines

@@ -8,21 +8,21 @@ 
 require_once '../inc/global.inc.php';
 
 // the section (tabs)
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 // notice for unauthorized people.
 api_protect_course_script(true);
 
 // breadcrumbs
-$interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises'));
+$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
 
 // Tool name
-$nameTools=get_lang('AddQuestionToExercise');
+$nameTools = get_lang('AddQuestionToExercise');
 
 // The form
-$form = new FormValidator('add_question','post',api_get_self().'?'.api_get_cidreq());
+$form = new FormValidator('add_question', 'post', api_get_self().'?'.api_get_cidreq());
 // form title
-$form->addElement('header','',get_lang('AddQuestionToExercise'));
+$form->addElement('header', '', get_lang('AddQuestionToExercise'));
 
 $question_list = Question::get_question_type_list();
 $question_list_options = array();
@@ -38,7 +38,7 @@ 
 );
 
 //session id
-$session_id  = api_get_session_id();
+$session_id = api_get_session_id();
 
 // the exercises
 $tbl_exercises = Database :: get_course_table(TABLE_QUIZ_TEST);
@@ -98,7 +98,7 @@ 
     Display::display_header($nameTools);
 
     echo '<div class="actions">';
-    echo '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    echo '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     echo '</div>';
 
     // displaying the form

main/exercice/calculated_answer.class.php

Spacing +9 added lines, -10 removed lines

@@ -133,8 +133,8 @@ 
             ),
             array('ToolbarSet' => 'TestQuestionDescription', 'Width' => '100%', 'Height' => '350'));
 
-        $form->addRule('answer', get_lang('GiveText'),'required');
-        $form->addRule('answer', get_lang('DefineBlanks'),'regex','/\[.*\]/');
+        $form->addRule('answer', get_lang('GiveText'), 'required');
+        $form->addRule('answer', get_lang('DefineBlanks'), 'regex', '/\[.*\]/');
 
         $form->addElement('label', null, get_lang('IfYouWantOnlyIntegerValuesWriteBothLimitsWithoutDecimals'));
         $form->addElement('html', '<div id="blanks_weighting"></div>');
@@ -161,7 +161,7 @@ 
         $form->setDefaults(array('weighting' => '10'));
 
         $form->addElement('text', 'answerVariations', get_lang('AnswerVariations'));
-        $form->addRule('answerVariations', get_lang('GiveAnswerVariations'),'required');
+        $form->addRule('answerVariations', get_lang('GiveAnswerVariations'), 'required');
         $form->setDefaults(array('answerVariations' => '1'));
 
         global $text;
@@ -201,22 +201,21 @@ 
             $answerVariations = $form->getSubmitValue('answerVariations');
             $this->weighting = $form->getSubmitValue('weighting');
             // Create as many answers as $answerVariations
-            for ($j=0 ; $j < $answerVariations; $j++) {
+            for ($j = 0; $j < $answerVariations; $j++) {
                 $auxAnswer = $answer;
                 $auxFormula = $formula;
                 $nb = preg_match_all('/\[[^\]]*\]/', $auxAnswer, $blanks);
                 if ($nb > 0) {
-                    for ($i=0 ; $i < $nb; ++$i) {
+                    for ($i = 0; $i < $nb; ++$i) {
                         $blankItem = $blanks[0][$i];
                         $replace = array("[", "]");
                         $newBlankItem = str_replace($replace, "", $blankItem);
                         $newBlankItem = "[".trim($newBlankItem)."]";
                         // take random float values when one or both edge values have a decimal point
                         $randomValue =
-                            (strpos($lowestValues[$i],'.') !== false ||
-                            strpos($highestValues[$i],'.') !== false) ?
-                            mt_rand($lowestValues[$i]*100,$highestValues[$i]*100)/100 :
-                            mt_rand($lowestValues[$i],$highestValues[$i]);
+                            (strpos($lowestValues[$i], '.') !== false ||
+                            strpos($highestValues[$i], '.') !== false) ?
+                            mt_rand($lowestValues[$i] * 100, $highestValues[$i] * 100) / 100 : mt_rand($lowestValues[$i], $highestValues[$i]);
                         $auxAnswer = str_replace($blankItem, $randomValue, $auxAnswer);
                         $auxFormula = str_replace($blankItem, $randomValue, $auxFormula);
                     }
@@ -250,7 +249,7 @@ 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="'.$this->question_table_class .'">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
                 <th>'.get_lang("Answer").'</th>
             </tr>';

main/exercice/matching.class.php

Spacing +12 added lines, -12 removed lines

@@ -72,12 +72,12 @@ 
                 for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
                     if ($answer->isCorrect($i)) {
                         $nb_matches++;
-                        $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
-                        $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
-                        $defaults['matches[' . $nb_matches . ']'] = $answer->correct[$i];
+                        $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i);
+                        $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1);
+                        $defaults['matches['.$nb_matches.']'] = $answer->correct[$i];
                     } else {
                         $nb_options++;
-                        $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
+                        $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i);
                     }
                 }
             }
@@ -108,10 +108,10 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="5%">' . get_lang('Number') . '</th>
-                    <th width="70%">' . get_lang('Answer') . '</th>
-                    <th width="15%">' . get_lang('MatchesTo') . '</th>
-                    <th width="10%">' . get_lang('Weighting') . '</th>
+                    <th width="5%">' . get_lang('Number').'</th>
+                    <th width="70%">' . get_lang('Answer').'</th>
+                    <th width="15%">' . get_lang('MatchesTo').'</th>
+                    <th width="10%">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -162,8 +162,8 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="15%">' . get_lang('Number') . '</th>
-                    <th width="85%">' . get_lang('Answer') . '</th>
+                    <th width="15%">' . get_lang('Number').'</th>
+                    <th width="85%">' . get_lang('Answer').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -185,7 +185,7 @@ 
 
             $form->addHtml('<tr>');
 
-            $form->addHtml('<td>' . chr(64 + $i) . '</td>');
+            $form->addHtml('<td>'.chr(64 + $i).'</td>');
             $form->addText("option[$i]", null);
 
             $form->addHtml('</tr>');
@@ -267,7 +267,7 @@ 
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="'.$this->question_table_class .'">';
+        $header .= '<table class="'.$this->question_table_class.'">';
         $header .= '<tr>
                 <th>'.get_lang('ElementList').'</th>
                 <th>'.get_lang('CorrespondsTo').'</th>