chamilo / chamilo-lms

main/exercise/hotspot_actionscript_admin.as.php

Indentation +4 added lines, -4 removed lines

@@ -98,10 +98,10 @@
         }*/
     }
 
-	// This is a good answer, count + 1 for nmbr of clicks
-	if ($answers['weighting'][$i] > 0) {
-		$nmbrTries++;
-	}
+    // This is a good answer, count + 1 for nmbr of clicks
+    if ($answers['weighting'][$i] > 0) {
+        $nmbrTries++;
+    }
 
     $hotSpot['coord'] = $answers['hotspot_coordinates'][$i];
     $data['hotspots'][] = $hotSpot;

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 
 api_protect_course_script(false);
 
-$isAllowedToEdit = api_is_allowed_to_edit(null,true);
+$isAllowedToEdit = api_is_allowed_to_edit(null, true);
 
 if (!$isAllowedToEdit) {
     api_not_allowed(true);
@@ -22,7 +22,7 @@ 
 $objQuestion = Question::read($questionId);
 $_course = api_get_course_info();
 
-$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 $picturePath = $documentPath.'/images';
 $pictureName = $objQuestion->selectPicture();
@@ -65,13 +65,13 @@ 
 $answers = $_SESSION['tmp_answers'];
 $nbrAnswers = count($answers['answer']);
 
-for ($i=1;$i <= $nbrAnswers; $i++) {
+for ($i = 1; $i <= $nbrAnswers; $i++) {
     $hotSpot = [];
     $hotSpot['id'] = null;
-    $hotSpot['answer']= $answers['answer'][$i];
+    $hotSpot['answer'] = $answers['answer'][$i];
 
     if ($answer_type == HOT_SPOT_DELINEATION) {
-        if ($i==1) {
+        if ($i == 1) {
             $hotSpot['type'] = 'delineation';
         } else {
             $hotSpot['type'] = 'oar';

main/exercise/evalmathnotation.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 get_lang('MultiplicationStar')."\n".
 get_lang('DivisionSlash')."\n".
 get_lang('ExponentiationCircumflex')."\n".
-get_lang('ModuloPercentage') . "\n" .
+get_lang('ModuloPercentage')."\n".
 "\n".
 get_lang('SquareRootSqrt')."\n".
 get_lang('AbsoluteValueAbs')."\n".

main/exercise/hotspot.inc.php

Indentation +6 added lines, -6 removed lines

@@ -18,10 +18,10 @@
 $file = file(api_get_path(SYS_LANG_PATH).'english/hotspot.inc.php');
 
 foreach ($file as &$value) {
-	$variable = explode('=', $value , 2);
-	if (count($variable) > 1) {
-		$variable = substr(trim($variable[0]), 1);
-		$variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' ';
-		echo $variable;
-	}
+    $variable = explode('=', $value , 2);
+    if (count($variable) > 1) {
+        $variable = substr(trim($variable[0]), 1);
+        $variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' ';
+        echo $variable;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $file = file(api_get_path(SYS_LANG_PATH).'english/hotspot.inc.php');
 
 foreach ($file as &$value) {
-	$variable = explode('=', $value , 2);
+	$variable = explode('=', $value, 2);
 	if (count($variable) > 1) {
 		$variable = substr(trim($variable[0]), 1);
 		$variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' ';

main/exercise/overview.php

Indentation +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
             break;
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
-               $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
+                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
             }
             else {
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));

Braces +1 added lines, -2 removed lines

@@ -250,8 +250,7 @@
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
-            }
-            else {
+            } else {
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));
             }
             break;

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-$current_course_tool  = TOOL_QUIZ;
+$current_course_tool = TOOL_QUIZ;
 
 // Clear the exercise session just in case
 Session::erase('objExercise');
@@ -70,7 +70,7 @@ 
 
 $html = '';
 $message = '';
-$html.= '<div class="exercise">';
+$html .= '<div class="exercise">';
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 $edit_link = '';
 if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
@@ -116,7 +116,7 @@ 
 
 // 2. Exercise button
 // Notice we not add there the lp_item_view_id because is not already generated
-$exercise_url = api_get_path(WEB_CODE_PATH) . 'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_item_view_id='.$learnpathItemViewId.$extra_params;
+$exercise_url = api_get_path(WEB_CODE_PATH).'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_item_view_id='.$learnpathItemViewId.$extra_params;
 $exercise_url_button = Display::url(
     $label,
     $exercise_url,
@@ -181,8 +181,8 @@ 
             $attempt_result['exe_result'],
             $attempt_result['exe_weighting']
         );
-        $attempt_url = api_get_path(WEB_CODE_PATH) . 'exercise/result.php?';
-        $attempt_url .= api_get_cidreq() . '&show_headers=1&';
+        $attempt_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?';
+        $attempt_url .= api_get_cidreq().'&show_headers=1&';
         $attempt_url .= http_build_query([
             'id' => $attempt_result['exe_id']
         ]);
@@ -192,7 +192,7 @@ 
             get_lang('Show'),
             $attempt_url,
             [
-                'class' => $btn_class . 'btn btn-default',
+                'class' => $btn_class.'btn btn-default',
                 'data-title' => get_lang('Show'),
                 'data-size' => 'lg'
             ]
@@ -210,7 +210,7 @@ 
             ),
             'userIp' => $attempt_result['user_ip']
         );
-        $attempt_link .= "&nbsp;&nbsp;&nbsp;" . $teacher_revised;
+        $attempt_link .= "&nbsp;&nbsp;&nbsp;".$teacher_revised;
 
         if (in_array(
             $objExercise->results_disabled,
@@ -306,7 +306,7 @@ 
 }
 
 if ($time_control) {
-    $html.= $objExercise->return_time_left_div();
+    $html .= $objExercise->return_time_left_div();
 }
 
 $html .= $message;
@@ -326,7 +326,7 @@ 
     $table_content,
     ['class' => 'table-responsive']
 );
-$html.= '</div>';
+$html .= '</div>';
 echo $html;
 
 Display::display_footer();

main/exercise/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>

main/exercise/exercise_reminder.php

Indentation +3 added lines, -3 removed lines

@@ -223,10 +223,10 @@
 
     $counter++;
     if ($objExercise->type == ONE_PER_PAGE) {
-       $question_title = Display::url($counter.'. '.cut($objQuestionTmp->selectTitle(), 40), $url);
-       $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
+        $question_title = Display::url($counter.'. '.cut($objQuestionTmp->selectTitle(), 40), $url);
+        $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
     } else {
-       $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
+        $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
     }
     //Check if the question doesn't have an answer
     if (!in_array($questionId, $exercise_result)) {

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 // notice for unauthorized people.
 api_protect_course_script(true);
 
-if ($debug>0) {
+if ($debug > 0) {
     error_log('Entered exercise_result.php: '.print_r($_POST, 1));
 }
 
@@ -97,7 +97,7 @@ 
 if (isset($_SESSION['exe_id'])) {
     $exe_id = intval($_SESSION['exe_id']);
 }
-$exercise_stat_info	= $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+$exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
 if (!empty($exercise_stat_info['data_tracking'])) {
     $question_list = explode(',', $exercise_stat_info['data_tracking']);
 }
@@ -249,7 +249,7 @@ 
     Display::url(
         get_lang('ReviewQuestions'),
         'javascript://',
-        array('onclick'=>'review_questions();','class'=>'btn btn-success')
+        array('onclick'=>'review_questions();', 'class'=>'btn btn-success')
     );
 
 echo Display::div('', array('class'=>'clear'));

main/exercise/admin.php

Braces +3 added lines, -2 removed lines

@@ -362,9 +362,10 @@
 
 if ($inATest) {
     echo '<div class="actions">';
-    if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid']))
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
+    if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid'])) {
+            echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
             Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+    }
 
     if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['myid']) &&  !isset($_GET['editQuestion'])) {
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'.

Spacing +35 added lines, -35 removed lines

@@ -48,7 +48,7 @@ 
  */
 
 require_once __DIR__.'/../inc/global.inc.php';
-$current_course_tool  = TOOL_QUIZ;
+$current_course_tool = TOOL_QUIZ;
 $this_section = SECTION_COURSES;
 
 // Access control
@@ -64,20 +64,20 @@ 
 
 /*  stripslashes POST data  */
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-    foreach($_POST as $key=>$val) {
-        if(is_string($val)) {
-            $_POST[$key]=stripslashes($val);
-        } elseif(is_array($val)) {
-            foreach($val as $key2=>$val2) {
-                $_POST[$key][$key2]=stripslashes($val2);
+    foreach ($_POST as $key=>$val) {
+        if (is_string($val)) {
+            $_POST[$key] = stripslashes($val);
+        } elseif (is_array($val)) {
+            foreach ($val as $key2=>$val2) {
+                $_POST[$key][$key2] = stripslashes($val2);
             }
         }
-        $GLOBALS[$key]=$_POST[$key];
+        $GLOBALS[$key] = $_POST[$key];
     }
 }
 
 if (empty($exerciseId)) {
-    $exerciseId = isset($_GET['exerciseId']) ? intval($_GET['exerciseId']):'0';
+    $exerciseId = isset($_GET['exerciseId']) ? intval($_GET['exerciseId']) : '0';
 }
 
 $newQuestion = isset($_GET['newQuestion']) ? $_GET['newQuestion'] : 0;
@@ -151,7 +151,7 @@ 
 if (!empty($_GET['action']) && $_GET['action'] == 'exportqti2' && !empty($_GET['questionId'])) {
     require_once 'export/qti2/qti2_export.php';
     $export = export_question_qti($_GET['questionId'], true);
-    $qid = (int)$_GET['questionId'];
+    $qid = (int) $_GET['questionId'];
     $archive_path = api_get_path(SYS_ARCHIVE_PATH);
     $temp_dir_short = uniqid();
     $temp_zip_dir = $archive_path."/".$temp_dir_short;
@@ -195,7 +195,7 @@ 
 if (!$fromExercise) {
     // gets the right exercise ID, and if 0 creates a new exercise
     if (!$exerciseId = $objExercise->selectId()) {
-        $modifyExercise='yes';
+        $modifyExercise = 'yes';
     }
 }
 
@@ -245,7 +245,7 @@ 
     } else {
         // goes back to the question viewing
         $editQuestion = $modifyQuestion;
-        unset($newQuestion,$modifyQuestion);
+        unset($newQuestion, $modifyQuestion);
     }
 }
 
@@ -281,27 +281,27 @@ 
     $nameTools = get_lang('QuestionManagement');
 }
 
-if (isset($_SESSION['gradebook'])){
-    $gradebook=	$_SESSION['gradebook'];
+if (isset($_SESSION['gradebook'])) {
+    $gradebook = $_SESSION['gradebook'];
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-    $interbreadcrumb[]= array(
+if (!empty($gradebook) && $gradebook == 'view') {
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
 }
 
-$interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises'));
-if (isset($_GET['newQuestion']) || isset($_GET['editQuestion']) ) {
+$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
+if (isset($_GET['newQuestion']) || isset($_GET['editQuestion'])) {
     $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$objExercise->id, "name" => $objExercise->name);
 } else {
     $interbreadcrumb[] = array("url" => "#", "name" => $objExercise->name);
 }
 
 // shows a link to go back to the question pool
-if (!$exerciseId && $nameTools != get_lang('ExerciseManagement')){
-    $interbreadcrumb[]=array(
+if (!$exerciseId && $nameTools != get_lang('ExerciseManagement')) {
+    $interbreadcrumb[] = array(
         "url" => api_get_path(WEB_CODE_PATH)."exercise/question_pool.php?fromExercise=$fromExercise&".api_get_cidreq(),
         "name" => get_lang('QuestionPool')
     );
@@ -309,10 +309,10 @@ 
 
 // if the question is duplicated, disable the link of tool name
 if ($modifyIn == 'thisExercise') {
-    if($buttonBack)	{
-        $modifyIn='allExercises';
+    if ($buttonBack) {
+        $modifyIn = 'allExercises';
     } else {
-        $noPHP_SELF=true;
+        $noPHP_SELF = true;
     }
 }
 $htmlHeadXtra[] = '<script>
@@ -344,10 +344,10 @@ 
 $htmlHeadXtra[] = $template->fetch($templateName);
 $htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');
 
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
 
-Display::display_header($nameTools,'Exercise');
+Display::display_header($nameTools, 'Exercise');
 /*
 if ($objExercise->exercise_was_added_in_lp) {
     if ($objExercise->force_edit_exercise_in_lp == true) {
@@ -364,22 +364,22 @@ 
     echo '<div class="actions">';
     if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid']))
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
-            Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['myid']) &&  !isset($_GET['editQuestion'])) {
+    if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['myid']) && !isset($_GET['editQuestion'])) {
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'.
-            Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&preview=1">'.
-        Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_MEDIUM).'</a>';
 
     echo Display::url(
-        Display::return_icon('test_results.png', get_lang('Results'),'',ICON_SIZE_MEDIUM),
+        Display::return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_MEDIUM),
         api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id
     );
 
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
-        Display::return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('settings.png', get_lang('ModifyExercise'), '', ICON_SIZE_MEDIUM).'</a>';
 
     $maxScoreAllQuestions = 0;
     if (!empty($objExercise->questionList)) {
@@ -395,7 +395,7 @@ 
     echo '<div class="alert alert-info">'.
         sprintf(get_lang('XQuestionsWithTotalScoreY'), $objExercise->selectNbrQuestions(), $maxScoreAllQuestions);
     if ($objExercise->random > 0) {
-        echo '<br />' .
+        echo '<br />'.
             sprintf(get_lang('OnlyXQuestionsPickedRandomly'), $objExercise->random);
     }
     echo '</div>';
@@ -404,13 +404,13 @@ 
     // we are in create a new question from question pool not in a test
     echo '<div class="actions">';
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'">'.
-        Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
     echo '</div>';
 } else {
     // If we are in question_pool but not in an test, go back to question create in pool
     echo '<div class="actions">';
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/question_pool.php?'.api_get_cidreq().'">'.
-        Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).
+        Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).
         '</a>';
     echo '</div>';
 }

main/exercise/exercice.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 // directly to exercise.php. This redirection is enabled for 1.10.x (2015-04-21)
 // The final goal of this file is to be removed in a few years time, if
 // considered realistically not harmful
-require __DIR__ . '/exercise.php';
+require __DIR__.'/exercise.php';

main/exercise/MatchingDraggable.php

Spacing +14 added lines, -14 removed lines

@@ -67,12 +67,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);
                     }
                 }
             }
@@ -103,10 +103,10 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="10">' . get_lang('Number') . '</th>
-                    <th width="85%">' . get_lang('Answer') . '</th>
-                    <th width="15%">' . get_lang('MatchesTo') . '</th>
-                    <th width="10">' . get_lang('Weighting') . '</th>
+                    <th width="10">' . get_lang('Number').'</th>
+                    <th width="85%">' . get_lang('Answer').'</th>
+                    <th width="15%">' . get_lang('MatchesTo').'</th>
+                    <th width="10">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -154,8 +154,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>';
@@ -176,7 +176,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>');
         }
@@ -258,10 +258,10 @@ 
     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.'">
                 <tr>
-                    <th>' . get_lang('ElementList') . '</th>
-                    <th>' . get_lang('CorrespondsTo') . '</th>
+                    <th>' . get_lang('ElementList').'</th>
+                    <th>' . get_lang('CorrespondsTo').'</th>
                 </tr>';
 
         return $header;