chamilo / chamilo-lms

main/exercice/question_create.php

Indentation +6 added lines, -6 removed lines

@@ -51,17 +51,17 @@
 $result = Database::query($sql);
 $exercises['-'] = '-'.get_lang('SelectExercise').'-';
 while ($row = Database :: fetch_array($result)) {
-	$exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
+    $exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
 }
 $form->addElement('select', 'exercise', get_lang('Exercise'), $exercises);
 
 // generate default content
 $form->addElement(
-	'checkbox',
-	'is_content',
-	null,
-	get_lang('GenerateDefaultContent'),
-	array('checked' => true)
+    'checkbox',
+    'is_content',
+    null,
+    get_lang('GenerateDefaultContent'),
+    array('checked' => true)
 );
 
 // the submit button

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>';

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      * @param null $feedback_type
      * @param null $counter
      * @param null $score
-     * @return null|string
+     * @return string
      */
     function return_header($feedback_type = null, $counter = null, $score = null)
     {

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>

main/exercice/question_admin.inc.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if (isset($_GET['editQuestion'])) {
-    $objQuestion = Question::read ($_GET['editQuestion']);
+    $objQuestion = Question::read($_GET['editQuestion']);
     $action = api_get_self()."?".api_get_cidreq()."&myid=1&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id;
 } else {
     $objQuestion = Question :: getInstance($_REQUEST['answerType']);
@@ -20,7 +20,7 @@ 
 
 if (is_object($objQuestion)) {
     // FORM CREATION
-    $form = new FormValidator('question_admin_form','post', $action);
+    $form = new FormValidator('question_admin_form', 'post', $action);
     if (isset($_GET['editQuestion'])) {
         $class = "btn btn-default";
         $text = get_lang('ModifyQuestion');
@@ -62,7 +62,7 @@ 
 
         // redirect
         if ($objQuestion->type != HOT_SPOT && $objQuestion->type != HOT_SPOT_DELINEATION) {
-            if(isset($_GET['editQuestion'])) {
+            if (isset($_GET['editQuestion'])) {
                 echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemUpdated"</script>';
             } else {
                 //New question

main/exercice/hotspot_updatescore.inc.php

Indentation +14 added lines, -14 removed lines

@@ -17,25 +17,25 @@
 $hotspotId	  = $_GET['hotspotId'];
 $exerciseId   = $objExcercise->selectId();
 if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
-	$hit = 0;
-	$answerId = $hotspotId;
+    $hit = 0;
+    $answerId = $hotspotId;
 
-	// remove from session
-	unset($_SESSION['exerciseResult'][$questionId][$answerId]);
+    // remove from session
+    unset($_SESSION['exerciseResult'][$questionId][$answerId]);
 
-	// Save clicking order
-	//$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
-	//$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
+    // Save clicking order
+    //$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
+    //$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
 } else { // user clicked ON a hotspot
-	$hit = 1;
-	$answerId = $hotspotId;
+    $hit = 1;
+    $answerId = $hotspotId;
 
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 
-	// Save clicking order
-	//$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
-	//$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
+    // Save clicking order
+    //$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
+    //$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
 }
 
 //round-up the coordinates

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 $questionId   = $_GET['questionId'];
 $coordinates  = $_GET['coord'];
 $objExcercise = $_SESSION['objExercise'];
-$hotspotId	  = $_GET['hotspotId'];
+$hotspotId = $_GET['hotspotId'];
 $exerciseId   = $objExcercise->selectId();
 if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
 	$hit = 0;
@@ -39,15 +39,15 @@ 
 }
 
 //round-up the coordinates
-$coords = explode('/',$coordinates);
+$coords = explode('/', $coordinates);
 $coordinates = '';
 foreach ($coords as $coord) {
-    list($x,$y) = explode(';',$coord);
+    list($x, $y) = explode(';', $coord);
     $coordinates .= round($x).';'.round($y).'/';
 }
-$coordinates = substr($coordinates,0,-1);
+$coordinates = substr($coordinates, 0, -1);
 
-$TBL_TRACK_E_HOTSPOT   = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
+$TBL_TRACK_E_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
 
 // update db
 $update_id = $_SESSION['exerciseResult'][$questionId]['ids'][$answerId];

main/exercice/hotspot_admin.inc.php

Indentation +4 added lines, -4 removed lines

@@ -907,10 +907,10 @@
                                         <?php } else { ?>
                                             <input class="form-control" type="text" name="weighting[<?php echo $i; ?>]" value="<?php echo (isset($weighting[$i]) ? $weighting[$i] : 10); ?>" />
                                                    <?php
-                                               }
-                                           }
-                                           if ($answerType == HOT_SPOT) {
-                                               ?>
+                                                }
+                                            }
+                                            if ($answerType == HOT_SPOT) {
+                                                ?>
                                         <input class="form-control" type="text" name="weighting[<?php echo $i; ?>]" value="<?php echo (isset($weighting[$i]) ? $weighting[$i] : 10); ?>" />
                                         <input type="hidden" name="hotspot_coordinates[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_coordinates[$i]) ? '0;0|0|0' : $hotspot_coordinates[$i]); ?>" />
                                         <input type="hidden" name="hotspot_type[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_type[$i]) ? 'square' : $hotspot_type[$i]); ?>" />

Spacing +49 added lines, -49 removed lines

@@ -25,7 +25,7 @@ 
 
 if ($modifyIn) {
     if ($debug > 0) {
-        echo '$modifyIn was set' . "<br />\n";
+        echo '$modifyIn was set'."<br />\n";
     }
     // if the user has chosen to modify the question only in the current exercise
     if ($modifyIn == 'thisExercise') {
@@ -64,7 +64,7 @@ 
     unset($buttonBack);
 }
 
-$hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercice/admin.php?' . api_get_cidreq() . '&exerciseId=' . $exerciseId;
+$hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&exerciseId='.$exerciseId;
 
 // the answer form has been submitted
 $submitAnswers = isset($_POST['submitAnswers']) ? true : false;
@@ -74,13 +74,13 @@ 
 if ($submitAnswers || $buttonBack) {
     if ($answerType == HOT_SPOT) {
         if ($debug > 0) {
-            echo '$submitAnswers or $buttonBack was set' . "<br />\n";
+            echo '$submitAnswers or $buttonBack was set'."<br />\n";
         }
 
         $questionWeighting = $nbrGoodAnswers = 0;
         for ($i = 1; $i <= $nbrAnswers; $i++) {
             if ($debug > 0) {
-                echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
             }
 
             $reponse[$i] = trim($reponse[$i]);
@@ -114,7 +114,7 @@ 
         if (empty($msgErr)) {
             for ($i = 1; $i <= $nbrAnswers; $i++) {
                 if ($debug > 0) {
-                    echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                    echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
                 }
 
                 $reponse[$i] = trim($reponse[$i]);
@@ -122,7 +122,7 @@ 
                 $weighting[$i] = ($weighting[$i]); //it can be float
 
                 if ($weighting[$i]) {
-                    $questionWeighting+=$weighting[$i];
+                    $questionWeighting += $weighting[$i];
                 }
 
                 // creates answer
@@ -145,15 +145,15 @@ 
 
             $editQuestion = $questionId;
             unset($modifyAnswers);
-            echo '<script type="text/javascript">window.location.href="' . $hotspot_admin_url . '&message=ItemUpdated"</script>';
+            echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
         }
 
         if ($debug > 0) {
-            echo '$modifyIn was set - end' . "<br />\n";
+            echo '$modifyIn was set - end'."<br />\n";
         }
     } else {
         if ($debug > 0) {
-            echo '$submitAnswers or $buttonBack was set' . "<br />\n";
+            echo '$submitAnswers or $buttonBack was set'."<br />\n";
         }
 
         $questionWeighting = $nbrGoodAnswers = 0;
@@ -168,7 +168,7 @@ 
 
         for ($i = 1; $i <= $nbrAnswers; $i++) {
             if ($debug > 0) {
-                echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
             }
 
             $reponse[$i] = trim($reponse[$i]);
@@ -193,7 +193,7 @@ 
                 $threadhold3_str = intval($threadhold3[$i]);
             }
 
-            $threadhold_total = $threadhold1_str . ';' . $threadhold2_str . ';' . $threadhold3_str;
+            $threadhold_total = $threadhold1_str.';'.$threadhold2_str.';'.$threadhold3_str;
 
             if (isset($try[$i]) && $try[$i] == 'on') {
                 $try_str = 1;
@@ -219,7 +219,7 @@ 
                 $question_str = $select_question[$i];
             }
 
-            $destination[$i] = $threadhold_total . '@@' . $try_str . '@@' . $lp_str . '@@' . $question_str . '@@' . $url_str;
+            $destination[$i] = $threadhold_total.'@@'.$try_str.'@@'.$lp_str.'@@'.$question_str.'@@'.$url_str;
 
             // checks if field is empty
             if (empty($reponse[$i]) && $reponse[$i] != '0') {
@@ -277,12 +277,12 @@ 
             $question_str = $selectQuestionNoError;
         }
 
-        $destination_noerror = $threadhold_total . '@@' . $try_str . '@@' . $lp_str . '@@' . $question_str . '@@' . $url_str;
+        $destination_noerror = $threadhold_total.'@@'.$try_str.'@@'.$lp_str.'@@'.$question_str.'@@'.$url_str;
 
         if (empty($msgErr)) {
             for ($i = 1; $i <= $nbrAnswers; $i++) {
                 if ($debug > 0) {
-                    echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                    echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
                 }
 
                 $reponse[$i] = trim($reponse[$i]);
@@ -290,7 +290,7 @@ 
                 $weighting[$i] = ($weighting[$i]); //it can be float
 
                 if ($weighting[$i]) {
-                    $questionWeighting+=$weighting[$i];
+                    $questionWeighting += $weighting[$i];
                 }
                 // creates answer
                 $objAnswer->createAnswer(
@@ -325,14 +325,14 @@ 
             $editQuestion = $questionId;
             unset($modifyAnswers);
 
-            echo '<script type="text/javascript">window.location.href="' . $hotspot_admin_url . '&message=ItemUpdated"</script>';
+            echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
         }
     }
 }
 
 if ($modifyAnswers) {
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 0) . '$modifyAnswers is set' . "<br />\n";
+        echo str_repeat('&nbsp;', 0).'$modifyAnswers is set'."<br />\n";
     }
 
     // construction of the Answer object
@@ -340,7 +340,7 @@ 
     Session::write('objAnswer', $objAnswer);
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 2) . '$answerType is HOT_SPOT' . "<br />\n";
+        echo str_repeat('&nbsp;', 2).'$answerType is HOT_SPOT'."<br />\n";
     }
 
     if ($answerType == HOT_SPOT_DELINEATION) {
@@ -521,11 +521,11 @@ 
     }
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 2) . '$usedInSeveralExercises is untrue' . "<br />\n";
+        echo str_repeat('&nbsp;', 2).'$usedInSeveralExercises is untrue'."<br />\n";
     }
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+        echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
     }
 
     if ($answerType == HOT_SPOT_DELINEATION) {
@@ -563,13 +563,13 @@ 
         );
     }
 
-    Display::tag('h3', get_lang('Question') . ": " . $questionName . ' <img src="../img/info3.gif" title="' . strip_tags(get_lang('HotspotChoose')) . '" alt="' . strip_tags(get_lang('HotspotChoose')) . '" />');
+    Display::tag('h3', get_lang('Question').": ".$questionName.' <img src="../img/info3.gif" title="'.strip_tags(get_lang('HotspotChoose')).'" alt="'.strip_tags(get_lang('HotspotChoose')).'" />');
 
     if (!empty($msgErr)) {
         Display::display_normal_message($msgErr); //main API
     }
 
-    $hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercice/admin.php?' . api_get_cidreq() . '&hotspotadmin=' . $modifyAnswers . '&exerciseId=' . $exerciseId . '&' . api_get_cidreq();
+    $hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&hotspotadmin='.$modifyAnswers.'&exerciseId='.$exerciseId.'&'.api_get_cidreq();
     ?>
     <form method="post" action="<?php echo $hotspot_admin_url; ?>" class="form-horizontal" id="frm_exercise" name="frm_exercise">
         <div class="form-group">
@@ -608,7 +608,7 @@ 
                                 <th><?php echo get_lang('Comment'); ?></th>
                                 <?php
                                 if ($answerType == HOT_SPOT_DELINEATION) {
-                                    echo '<th >' . get_lang('Scenario') . '</th>';
+                                    echo '<th >'.get_lang('Scenario').'</th>';
                                 }
                                 ?>
                                 <?php
@@ -640,36 +640,36 @@ 
                                         $isSelected = true;
                                         $selected = 'selected="selected"';
                                     }
-                                    $option_lp.='<option value="' . $id . '" ' . $selected . '>' . $details['lp_name'] . '</option>';
+                                    $option_lp .= '<option value="'.$id.'" '.$selected.'>'.$details['lp_name'].'</option>';
                                 }
 
                                 if ($isSelected) {
-                                    $option_lp = '<option value="0">' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                                    $option_lp = '<option value="0">'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                                 } else {
-                                    $option_lp = '<option value="0" selected="selected" >' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                                    $option_lp = '<option value="0" selected="selected" >'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                                 }
 
                                 // Feedback SELECT
                                 $question_list = $objExercise->selectQuestionList();
                                 $option_feed = '';
-                                $option_feed.='<option value="0">' . get_lang('SelectTargetQuestion') . '</option>';
+                                $option_feed .= '<option value="0">'.get_lang('SelectTargetQuestion').'</option>';
 
                                 foreach ($question_list as $key => $questionid) {
                                     $selected = '';
                                     $question = Question::read($questionid);
-                                    $val = 'Q' . $key . ' :' . substrwords($question->selectTitle(), ICON_SIZE_SMALL);
+                                    $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL);
 
                                     if (isset($select_question[$i]) && $questionid == $select_question[$i]) {
                                         $selected = 'selected="selected"';
                                     }
 
-                                    $option_feed.='<option value="' . $questionid . '" ' . $selected . ' >' . $val . '</option>';
+                                    $option_feed .= '<option value="'.$questionid.'" '.$selected.' >'.$val.'</option>';
                                 }
 
                                 if (isset($select_question[$i]) && $select_question[$i] == -1) {
-                                    $option_feed .= '<option value="-1" selected="selected" >' . get_lang('ExitTest') . '</option>';
+                                    $option_feed .= '<option value="-1" selected="selected" >'.get_lang('ExitTest').'</option>';
                                 } else {
-                                    $option_feed .= '<option value="-1">' . get_lang('ExitTest') . '</option>';
+                                    $option_feed .= '<option value="-1">'.get_lang('ExitTest').'</option>';
                                 }
 
                                 //-------- IF it is a delineation
@@ -685,9 +685,9 @@ 
                                             $selected2 = 'selected="selected"';
                                         if ($k == $threadhold3[$i])
                                             $selected3 = 'selected="selected"';
-                                        $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
-                                        $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
-                                        $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
+                                        $option1 .= '<option '.$selected1.' >'.$k.' % </option>';
+                                        $option2 .= '<option '.$selected2.' >'.$k.' % </option>';
+                                        $option3 .= '<option '.$selected3.'>'.$k.' %</option>';
                                     }
                                     ?>
                                     <tr>
@@ -731,7 +731,7 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -784,7 +784,7 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -849,7 +849,7 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -889,12 +889,12 @@ 
                                         <input class="form-control" type="text" name="reponse[<?php echo $i; ?>]" value="<?php echo Security::remove_XSS($responseValue); ?>" />
                                     </td>
                                     <?php
-                                    $form = new FormValidator('form_' . $i);
+                                    $form = new FormValidator('form_'.$i);
                                     $config = array(
                                         'ToolbarSet' => 'TestProposedAnswer',
                                         'cols-size' => [0, 12, 0]
                                     );
-                                    $form->addHtmlEditor('comment[' . $i . ']', null, false, false, $config);
+                                    $form->addHtmlEditor('comment['.$i.']', null, false, false, $config);
                                     $renderer = $form->defaultRenderer();
                                     $form_template = '{content}';
                                     $renderer->setFormTemplate($form_template);
@@ -903,7 +903,7 @@ 
                                         {element}';
                                     $renderer->setElementTemplate($element_template);
 
-                                    $form->setDefaults(array('comment[' . $i . ']' => $commentValue));
+                                    $form->setDefaults(array('comment['.$i.']' => $commentValue));
                                     $return = $form->return_form();
                                     ?>
                                     <td colspan="2" align="left" ><?php echo $return; ?></td>
@@ -942,36 +942,36 @@ 
                                 $selected = 'selected="selected"';
                                 $isSelected = true;
                             }
-                            $option_lp.='<option value="' . $id . '" ' . $selected . '>' . $details['lp_name'] . '</option>';
+                            $option_lp .= '<option value="'.$id.'" '.$selected.'>'.$details['lp_name'].'</option>';
                         }
 
                         if ($isSelected) {
-                            $option_lp = '<option value="0">' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                            $option_lp = '<option value="0">'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                         } else {
-                            $option_lp = '<option value="0" selected="selected" >' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                            $option_lp = '<option value="0" selected="selected" >'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                         }
 
                         // Feedback SELECT
                         $question_list = $objExercise->selectQuestionList();
                         $option_feed = '';
-                        $option_feed.='<option value="0">' . get_lang('SelectTargetQuestion') . '</option>';
+                        $option_feed .= '<option value="0">'.get_lang('SelectTargetQuestion').'</option>';
                         $details = isset($details) ? $details : null;
                         $id = isset($id) ? $id : 0;
                         $selectQuestionNoError = isset($selectQuestionNoError) ? $selectQuestionNoError : null;
                         foreach ($question_list as $key => $questionid) {
                             $selected = '';
                             $question = Question::read($questionid);
-                            $val = 'Q' . $key . ' :' . substrwords($question->selectTitle(), ICON_SIZE_SMALL);
+                            $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL);
                             $select_lp_id[$id] = $details['lp_name'];
                             if ($questionid == $selectQuestionNoError) {
                                 $selected = 'selected="selected"';
                             }
-                            $option_feed.='<option value="' . $questionid . '" ' . $selected . ' >' . $val . '</option>';
+                            $option_feed .= '<option value="'.$questionid.'" '.$selected.' >'.$val.'</option>';
                         }
                         if ($selectQuestionNoError == -1) {
-                            $option_feed.='<option value="-1" selected="selected" >' . get_lang('ExitTest') . '</option>';
+                            $option_feed .= '<option value="-1" selected="selected" >'.get_lang('ExitTest').'</option>';
                         } else {
-                            $option_feed.='<option value="-1">' . get_lang('ExitTest') . '</option>';
+                            $option_feed .= '<option value="-1">'.get_lang('ExitTest').'</option>';
                         }
 
                         if ($answerType == HOT_SPOT_DELINEATION) {
@@ -1062,6 +1062,6 @@ 
     </script>
     <?php
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 0) . '$modifyAnswers was set - end' . "<br />\n";
+        echo str_repeat('&nbsp;', 0).'$modifyAnswers was set - end'."<br />\n";
     }
 }

Braces +32 added lines, -13 removed lines

@@ -366,8 +366,9 @@ 
         if ($answerType == HOT_SPOT_DELINEATION) {
             // the magic happens here ...
             // we do this to not count the if no error section
-            if ($nbrAnswers >= 2)
-                $nbrAnswers--;
+            if ($nbrAnswers >= 2) {
+                            $nbrAnswers--;
+            }
         }
 
         $reponse = array();
@@ -679,12 +680,15 @@ 
 
                                     for ($k = 1; $k <= 100; $k++) {
                                         $selected1 = $selected2 = $selected3 = '';
-                                        if ($k == $threadhold1[$i])
-                                            $selected1 = 'selected="selected"';
-                                        if ($k == $threadhold2[$i])
-                                            $selected2 = 'selected="selected"';
-                                        if ($k == $threadhold3[$i])
-                                            $selected3 = 'selected="selected"';
+                                        if ($k == $threadhold1[$i]) {
+                                                                                    $selected1 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold2[$i]) {
+                                                                                    $selected2 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold3[$i]) {
+                                                                                    $selected3 = 'selected="selected"';
+                                        }
                                         $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
                                         $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
                                         $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
@@ -731,7 +735,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -784,7 +791,10 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -823,7 +833,10 @@ 
                                             <th ><?php echo get_lang('OAR'); ?>*</th>
                                             <?php if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { ?>
                                                 <th colspan="2" ><?php echo get_lang('Comment'); ?></th>
-                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) echo get_lang('Scenario'); ?></th>
+                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) {
+    echo get_lang('Scenario');
+}
+?></th>
                                             <?php } else { ?>
                                                 <th colspan="3" ><?php echo get_lang('Comment'); ?></th>
                                             <?php } ?>
@@ -849,7 +862,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -998,7 +1014,10 @@ 
                                         <div class="checkbox">
                                             <p>
                                                 <label>
-                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) echo'checked'; ?> />
+                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) {
+    echo'checked';
+}
+?> />
                                                     <?php echo get_lang('TryAgain'); ?>
                                                 </label>
                                             </p>

main/exercice/global_multiple_answer.class.php

Spacing +24 added lines, -24 removed lines

@@ -34,18 +34,18 @@ 
         $html = '<table class="data_table">

                 <tr>

                     <th width="10px">

-                        ' . get_lang('Number') . '

+                        ' . get_lang('Number').'

                     </th>

                     <th width="10px">

-                        ' . get_lang('True') . '

+                        ' . get_lang('True').'

                     </th>

                     <th width="50%">

-                        ' . get_lang('Answer') . '

+                        ' . get_lang('Answer').'

                     </th>';

 

-        $html .='<th>' . get_lang('Comment') . '</th>';

-        $html .='</tr>';

-        $form->addElement('label', get_lang('Answers') . '<br /> <img src="../img/fill_field.png">', $html);

+        $html .= '<th>'.get_lang('Comment').'</th>';

+        $html .= '</tr>';

+        $form->addElement('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);

         $defaults = array();

         $correct = 0;

         $answer = false;

@@ -77,9 +77,9 @@ 
         for ($i = 1; $i <= $nb_answers; ++$i) {

             /* si la reponse est de type objet */

             if (is_object($answer)) {

-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];

-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];

-                $defaults['correct[' . $i . ']'] = $answer->correct[$i];

+                $defaults['answer['.$i.']'] = $answer->answer[$i];

+                $defaults['comment['.$i.']'] = $answer->comment[$i];

+                $defaults['correct['.$i.']'] = $answer->correct[$i];

 

                 // start

                 $scoreA = $answer->weighting[$i];

@@ -101,16 +101,16 @@ 
             $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>', 'weighting['.$i.']');

 

-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');

+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');

             $answer_number->freeze();

 

-            $form->addElement('checkbox', 'correct[' . $i . ']', null, null, 'class="checkbox"');

-            $boxes_names[] = 'correct[' . $i . ']';

+            $form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox"');

+            $boxes_names[] = 'correct['.$i.']';

 

-            $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', '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'));

 

             $form->addElement('html', '</tr>');

         }

@@ -176,7 +176,7 @@ 
         // Reponses correctes

         $nbr_corrects = 0;

         for ($i = 1; $i <= $nb_answers; $i++) {

-            $goodAnswer = trim($form->getSubmitValue('correct[' . $i . ']'));

+            $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));

             if ($goodAnswer) {

                 $nbr_corrects++;

             }

@@ -195,9 +195,9 @@ 
         $test = $form->getSubmitValue('pts');

 

         for ($i = 1; $i <= $nb_answers; $i++) {

-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));

-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));

-            $goodAnswer = trim($form->getSubmitValue('correct[' . $i . ']'));

+            $answer = trim($form->getSubmitValue('answer['.$i.']'));

+            $comment = trim($form->getSubmitValue('comment['.$i.']'));

+            $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));

 

             if ($goodAnswer) {

                 $weighting = abs($answer_score);

@@ -225,12 +225,12 @@ 
         $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>

-            <th>' . get_lang("Answer") . '</th>';

-        $header .= '<th>' . get_lang("Comment") . '</th>';

+            <th>' . get_lang("Choice").'</th>

+            <th>' . get_lang("ExpectedChoice").'</th>

+            <th>' . get_lang("Answer").'</th>';

+        $header .= '<th>'.get_lang("Comment").'</th>';

         $header .= '</tr>';

 

         return $header;

main/exercice/hotspot_savescore.inc.php

Indentation +6 added lines, -6 removed lines

@@ -17,15 +17,15 @@
 $answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids'])+1;
 if ($_GET['answerId'] == "0") // click is NOT on a hotspot
 {
-	$hit = 0;
-	$answerId = NULL;
+    $hit = 0;
+    $answerId = NULL;
 }
 else // user clicked ON a hotspot
 {
-	$hit = 1;
-	$answerId = api_substr($_GET['answerId'],22,2);
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    $hit = 1;
+    $answerId = api_substr($_GET['answerId'],22,2);
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 //round-up the coordinates
 $coords = explode('/',$coordinates);

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 $objExcercise = $_SESSION['objExercise'];
 $exerciseId   = $objExcercise->selectId();
 // Save clicking order
-$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids'])+1;
+$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids']) + 1;
 if ($_GET['answerId'] == "0") // click is NOT on a hotspot
 {
 	$hit = 0;
@@ -23,18 +23,18 @@ 
 else // user clicked ON a hotspot
 {
 	$hit = 1;
-	$answerId = api_substr($_GET['answerId'],22,2);
+	$answerId = api_substr($_GET['answerId'], 22, 2);
 	// Save into session
 	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 //round-up the coordinates
-$coords = explode('/',$coordinates);
+$coords = explode('/', $coordinates);
 $coordinates = '';
 foreach ($coords as $coord) {
-    list($x,$y) = explode(';',$coord);
+    list($x, $y) = explode(';', $coord);
     $coordinates .= round($x).';'.round($y).'/';
 }
-$coordinates = substr($coordinates,0,-1);
+$coordinates = substr($coordinates, 0, -1);
 
 $TBL_TRACK_E_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
 // Save into db
@@ -44,7 +44,7 @@ 
     'quiz_id' => $exerciseId,
     'question_id' => $questionId,
     'answer_id' =>  $answerId,
-    'correct' => $hit ,
+    'correct' => $hit,
     'coordinate' => $coordinates
 ];
 // Save insert id into session if users changes answer.

Braces +4 added lines, -3 removed lines

@@ -15,12 +15,13 @@
 $exerciseId   = $objExcercise->selectId();
 // Save clicking order
 $answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids'])+1;
-if ($_GET['answerId'] == "0") // click is NOT on a hotspot
+if ($_GET['answerId'] == "0") {
+    // click is NOT on a hotspot
 {
 	$hit = 0;
-	$answerId = NULL;
 }
-else // user clicked ON a hotspot
+	$answerId = NULL;
+} else // user clicked ON a hotspot
 {
 	$hit = 1;
 	$answerId = api_substr($_GET['answerId'],22,2);

main/exercice/exercise_submit_modal.php

Indentation +144 added lines, -144 removed lines

@@ -41,13 +41,13 @@ 
 $learnpath_id = 0;
 
 if (empty($learnpath_id)) {
-	$learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']);
+    $learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']);
 }
 
 $learnpath_item_id = 0;
 
 if (empty($learnpath_item_id)) {
-	$learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
+    $learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
 }
 
 $_SESSION['hotspot_coord']=array();
@@ -68,12 +68,12 @@ 
 $coords = explode('/', $_GET['hotspot']);
 $user_array = '';
 if (is_array($coords) && count($coords) > 0) {
-	foreach ($coords as $coord) {
+    foreach ($coords as $coord) {
         if (!empty($coord)) {
             list($x, $y) = explode(';', $coord);
             $user_array .= round($x).';'.round($y).'/';
         }
-	}
+    }
 }
 
 $choice_value = '';
@@ -87,7 +87,7 @@ 
 // Getting the options by js
 if (empty($choice_value)) {
 
-	echo "<script>
+    echo "<script>
 		// this works for only radio buttons
 		var f = self.parent.window.document.frm_exercise;
 		var choice_js='';
@@ -116,12 +116,12 @@ 
 		}
 
 	";
-	// IMPORTANT
-	//this is the real redirect function
-	//echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
+    // IMPORTANT
+    //this is the real redirect function
+    //echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo ' url = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo "$('#global-modal .modal-body').load(url);";
-	echo '</script>';
+    echo '</script>';
 
     exit;
 }
@@ -174,12 +174,12 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+    $objQuestionTmp 	= Question :: read($questionid);
+    $questionName		=$objQuestionTmp->selectTitle();
+    $questionDescription=$objQuestionTmp->selectDescription();
+    $questionWeighting	=$objQuestionTmp->selectWeighting();
+    $answerType			=$objQuestionTmp->selectType();
+    $quesId				=$objQuestionTmp->selectId(); //added by priya saini
 }
 
 $objAnswerTmp=new Answer($questionid);
@@ -202,43 +202,43 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-		$answer            = $objAnswerTmp->selectAnswer($answerId);
-		$answerComment     = $objAnswerTmp->selectComment($answerId);
-		$answerDestination = $objAnswerTmp->selectDestination($answerId);
-
-		$answerCorrect     = $objAnswerTmp->isCorrect($answerId);
-		$answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
-		$numAnswer         = $objAnswerTmp->selectAutoId($answerId);
-
-		//delineation
-		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+    for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+        $answer            = $objAnswerTmp->selectAnswer($answerId);
+        $answerComment     = $objAnswerTmp->selectComment($answerId);
+        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+        $answerCorrect     = $objAnswerTmp->isCorrect($answerId);
+        $answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
+        $numAnswer         = $objAnswerTmp->selectAutoId($answerId);
+
+        //delineation
+        $delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
+        $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
         if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
 
-		switch($answerType) {
-			// for unique answer
-			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
-				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
-				}
-				break;
-			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
-				if ($studentChoice) {
-					$newquestionList[]=$questionid;
-				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
-				}
-				break;
-		}
+        switch($answerType) {
+            // for unique answer
+            case UNIQUE_ANSWER :
+                $studentChoice = ($choice_value == $numAnswer)?1:0;
+                if ($studentChoice) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $newquestionList[]=$questionid;
+                }
+                break;
+            case HOT_SPOT_DELINEATION :
+                $studentChoice=$choice[$answerId];
+                if ($studentChoice) {
+                    $newquestionList[]=$questionid;
+                }
+                if ($answerId===1) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $_SESSION['hotspot_coord'][1]	=$delineation_cord;
+                    $_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+                }
+                break;
+        }
 
 
         if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
@@ -335,7 +335,7 @@ 
                         $lp_hotspot=$destination_items[2];
                         $select_question_hotspot=$destination_items[3];
                         $url_hotspot=$destination_items[4];
-                         //echo 'show the feedback';
+                            //echo 'show the feedback';
                     }
                 } elseif($answerId>1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
@@ -392,41 +392,41 @@ 
                 //we send the error
             }
         }
-	}
+    }
 
-	if ($overlap_color) {
-		$overlap_color='green';
+    if ($overlap_color) {
+        $overlap_color='green';
     } else {
-		$overlap_color='red';
+        $overlap_color='red';
     }
-	if ($missing_color) {
-		$missing_color='green';
+    if ($missing_color) {
+        $missing_color='green';
     } else {
-		$missing_color='red';
+        $missing_color='red';
     }
-	if ($excess_color) {
-		$excess_color='green';
+    if ($excess_color) {
+        $excess_color='green';
     } else {
-		$excess_color='red';
+        $excess_color='red';
     }
 
     if (!is_numeric($final_overlap)) {
-    	$final_overlap = 0;
+        $final_overlap = 0;
     }
 
     if (!is_numeric($final_missing)) {
-    	$final_missing = 0;
+        $final_missing = 0;
     }
     if (!is_numeric($final_excess)) {
-    	$final_excess = 0;
+        $final_excess = 0;
     }
 
     if ($final_excess>100) {
-    	$final_excess = 100;
+        $final_excess = 100;
     }
 
 
-	$table_resume = '<table class="data_table" >
+    $table_resume = '<table class="data_table" >
 	<tr class="row_odd" >
 		<td></td>
 		<td ><b>'.get_lang('Requirements').'</b></td>
@@ -451,7 +451,7 @@ 
 		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
-	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
+    //var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
@@ -468,68 +468,68 @@ 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
         $item_list = explode('@@',$destination);
-    	//print_R($item_list);
-    	$try = $item_list[0];
-    	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+        //print_R($item_list);
+        $try = $item_list[0];
+        $lp = $item_list[1];
+        $destinationid= $item_list[2];
+        $url=$item_list[3];
     }
-	$table_resume='';
+    $table_resume='';
 } else {
-		$try = $try_hotspot;
-		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
-		// no error = no oar and no wrong result for delineation
-		//show if no error
-		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
-
-		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
-		$exerciseResult[$questionid] = 1;
-	} else {
-		$exerciseResult[$questionid] = 0;
-	}
+        $try = $try_hotspot;
+        $lp = $lp_hotspot;
+        $destinationid= $select_question_hotspot;
+        $url=$url_hotspot;
+    if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+        // no error = no oar and no wrong result for delineation
+        //show if no error
+        //echo 'no error';
+        $comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+        $answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+
+        //we send the error
+        $destination_items= explode('@@', $answerDestination);
+        $try=$destination_items[1];
+        $lp=$destination_items[2];
+        $destinationid=$destination_items[3];
+        $url=$destination_items[4];
+        $exerciseResult[$questionid] = 1;
+    } else {
+        $exerciseResult[$questionid] = 0;
+    }
 }
 
 // the link to retry the question
 if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+    $num_value_array= (array_keys($questionList, $questionid));
+    $links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
-	$list = new LearnpathList(api_get_user_id());
-	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+    $lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+    $list = new LearnpathList(api_get_user_id());
+    $flat_list = $list->get_flat_list();
+    $links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
 $links.='<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+    $links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
 if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+    $links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
-	// the link to other question
-	if (in_array($destinationid,$questionList)) {
-		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
-	}
+    // the link to other question
+    if (in_array($destinationid,$questionList)) {
+        $objQuestionTmp = Question :: read($destinationid);
+        $questionName=$objQuestionTmp->selectTitle();
+        $num_value_array= (array_keys($questionList, $destinationid));
+        $links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+    }
 }
 
 echo '<script>
@@ -546,43 +546,43 @@ 
 </script>';
 
 if ($links!='') {
-	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
+    /*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
-	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
-
-	if ($answerType == HOT_SPOT_DELINEATION) {
-		if ($organs_at_risk_hit > 0) {
-			//$message='<p>'.get_lang('YourDelineation').'</p>';
-			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
-			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
-		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
-		}
-		echo $message;
-	} else {
-		echo '<p>'.$comment.'</p>';
-	}
-	echo '<h3>'.$links.'</h3>';
-	echo '</div>';
-
-	$_SESSION['hot_spot_result']=$message;
-	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
-	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
-
-	//save this variables just in case the exercise loads an LP with other exercise
-	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
-	$_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
-	$_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
+    echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
+
+    if ($answerType == HOT_SPOT_DELINEATION) {
+        if ($organs_at_risk_hit > 0) {
+            //$message='<p>'.get_lang('YourDelineation').'</p>';
+            //$message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+            //if ($wrong_results) { }
+            $message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+            $message.='<p>'.$comment.'</p>';
+        } else {
+            $message='<p>'.get_lang('YourDelineation').'</p>';
+            $message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+            $message.='<p>'.$comment.'</p>';
+        }
+        echo $message;
+    } else {
+        echo '<p>'.$comment.'</p>';
+    }
+    echo '<h3>'.$links.'</h3>';
+    echo '</div>';
+
+    $_SESSION['hot_spot_result']=$message;
+    $_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
+    //reseting the exerciseResult variable
+    Session::write('exerciseResult',$exerciseResult);
+
+    //save this variables just in case the exercise loads an LP with other exercise
+    $_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
+    $_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
+    $_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
 } else {
-	$questionNum++;
-	echo '<script>
+    $questionNum++;
+    echo '<script>
 			self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
    			//self.parent.tb_remove();
  	 	</script>';

Spacing +136 added lines, -136 removed lines

@@ -50,9 +50,9 @@ 
 	$learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
 }
 
-$_SESSION['hotspot_coord']=array();
-$newquestionList= $_SESSION['newquestionList'];
-$questionList 	= $_SESSION['questionList'];
+$_SESSION['hotspot_coord'] = array();
+$newquestionList = $_SESSION['newquestionList'];
+$questionList = $_SESSION['questionList'];
 
 $exerciseId		= intval($_GET['exerciseId']);
 $exerciseType	= intval($_GET['exerciseType']);
@@ -78,9 +78,9 @@ 
 
 $choice_value = '';
 
-$user_array = substr($user_array,0,-1);
+$user_array = substr($user_array, 0, -1);
 
-if (isset($_GET['choice'])){
+if (isset($_GET['choice'])) {
     $choice_value = intval($_GET['choice']);
 }
 
@@ -127,7 +127,7 @@ 
 }
 
 $choice = array();
-$questionid= $questionList[$questionNum];
+$questionid = $questionList[$questionNum];
 // $choice_value => value of the user selection
 $choice[$questionid] = isset($choice_value) ? $choice_value : null;
 
@@ -144,11 +144,11 @@ 
         $exerciseResult = $choice;
     } else {
         // gets the question ID from $choice. It is the key of the array
-        list($key)=array_keys($choice);
+        list($key) = array_keys($choice);
         // if the user didn't already answer this question
-        if(!isset($exerciseResult[$key])) {
+        if (!isset($exerciseResult[$key])) {
             // stores the user answer into the array
-            $exerciseResult[$key]=$choice[$key];
+            $exerciseResult[$key] = $choice[$key];
         }
     }
 }
@@ -174,26 +174,26 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+	$objQuestionTmp = Question :: read($questionid);
+	$questionName = $objQuestionTmp->selectTitle();
+	$questionDescription = $objQuestionTmp->selectDescription();
+	$questionWeighting = $objQuestionTmp->selectWeighting();
+	$answerType = $objQuestionTmp->selectType();
+	$quesId = $objQuestionTmp->selectId(); //added by priya saini
 }
 
-$objAnswerTmp=new Answer($questionid);
-$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
+$objAnswerTmp = new Answer($questionid);
+$nbrAnswers = $objAnswerTmp->selectNbrAnswers();
 //echo 'answe_type '.$answerType;echo '<br />';
 
 $choice = $exerciseResult[$questionid];
-$destination=array();
-$comment='';
-$next=1;
+$destination = array();
+$comment = '';
+$next = 1;
 $_SESSION['hotspot_coord'] = array();
 $_SESSION['hotspot_dest'] = array();
 
-$overlap_color = $missing_color = $excess_color=false;
+$overlap_color = $missing_color = $excess_color = false;
 $organs_at_risk_hit = 0;
 $wrong_results = false;
 $hot_spot_load = false;
@@ -202,7 +202,7 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+	for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
 		$answer            = $objAnswerTmp->selectAnswer($answerId);
 		$answerComment     = $objAnswerTmp->selectComment($answerId);
 		$answerDestination = $objAnswerTmp->selectDestination($answerId);
@@ -213,29 +213,29 @@ 
 
 		//delineation
 		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
-        if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
+		$answer_delineation_destination = $objAnswerTmp->selectDestination(1);
+        if ($dbg_local > 0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination, 0); }
 
-		switch($answerType) {
+		switch ($answerType) {
 			// for unique answer
 			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
+				$studentChoice = ($choice_value == $numAnswer) ? 1 : 0;
 				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
+					$questionScore += $answerWeighting;
+					$totalScore		+= $answerWeighting;
+					$newquestionList[] = $questionid;
 				}
 				break;
 			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
+			    $studentChoice = $choice[$answerId];
 				if ($studentChoice) {
-					$newquestionList[]=$questionid;
+					$newquestionList[] = $questionid;
 				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+				if ($answerId === 1) {
+					$questionScore += $answerWeighting;
+					$totalScore += $answerWeighting;
+					$_SESSION['hotspot_coord'][1] = $delineation_cord;
+					$_SESSION['hotspot_dest'][1] = $answer_delineation_destination;
 				}
 				break;
 		}
@@ -247,27 +247,27 @@ 
                 $destination = $answerDestination;
                 $comment = $answerComment;
             }
-        } elseif($answerType == HOT_SPOT_DELINEATION) {
+        } elseif ($answerType == HOT_SPOT_DELINEATION) {
             if ($next) {
-                if ($dbg_local>0) { error_log(__LINE__.' - next',0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' - next', 0); }
                 $hot_spot_load = true; //apparently the script is called twice
                 $user_answer = $user_array;
-                $_SESSION['exerciseResultCoordinates'][$questionid]=$user_answer; //needed for exercise_result.php
+                $_SESSION['exerciseResultCoordinates'][$questionid] = $user_answer; //needed for exercise_result.php
 
                 // we compare only the delineation not the other points
-                $answer_question	= $_SESSION['hotspot_coord'][1];
-                $answerDestination	= $_SESSION['hotspot_dest'][1];
+                $answer_question = $_SESSION['hotspot_coord'][1];
+                $answerDestination = $_SESSION['hotspot_dest'][1];
 
-                $poly_user 				= convert_coordinates($user_answer,'/');
-                $poly_answer 			= convert_coordinates($answer_question,'|');
-                $max_coord 				= poly_get_max($poly_user,$poly_answer);
+                $poly_user 				= convert_coordinates($user_answer, '/');
+                $poly_answer = convert_coordinates($answer_question, '|');
+                $max_coord 				= poly_get_max($poly_user, $poly_answer);
 
                 if (empty($_GET['hotspot'])) { //no user response
                     $overlap = -2;
                 } else {
-                    $poly_user_compiled 	= poly_compile($poly_user,$max_coord);
-                    $poly_answer_compiled 	= poly_compile($poly_answer,$max_coord);
-                    $poly_results 			= poly_result($poly_answer_compiled,$poly_user_compiled,$max_coord);
+                    $poly_user_compiled = poly_compile($poly_user, $max_coord);
+                    $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+                    $poly_results = poly_result($poly_answer_compiled, $poly_user_compiled, $max_coord);
 
                     $overlap = $poly_results['both'];
                     $poly_answer_area = $poly_results['s1'];
@@ -277,7 +277,7 @@ 
                 }
 
                 //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels
-                if ($dbg_local>0) { error_log(__LINE__.' - Polygons results are '.print_r($poly_results,1),0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0); }
                 if ($overlap < 1) {
                     //shortcut to avoid complicated calculations
                     $final_overlap = 0;
@@ -285,27 +285,27 @@ 
                     $final_excess  = 100;
                 } else {
                     // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
-                    $final_overlap = round(((float)$overlap / (float)$poly_answer_area)*100);
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final overlap is '.$final_overlap,0);}
+                    $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final overlap is '.$final_overlap, 0); }
                     // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
                     $final_missing = 100 - $final_overlap;
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final missing is '.$final_missing,0);}
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final missing is '.$final_missing, 0); }
                     // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
-                    $final_excess = round((((float)$poly_user_area-(float)$overlap)/(float)$poly_answer_area)*100);
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final excess is '.$final_excess,0);}
+                    $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final excess is '.$final_excess, 0); }
                 }
 
-                $destination_items= explode('@@', $answerDestination);
+                $destination_items = explode('@@', $answerDestination);
                 $threadhold_total = $destination_items[0];
-                $threadhold_items=explode(';',$threadhold_total);
+                $threadhold_items = explode(';', $threadhold_total);
                 $threadhold1 = $threadhold_items[0]; // overlap
                 $threadhold2 = $threadhold_items[1]; // excess
-                $threadhold3 = $threadhold_items[2];	 //missing
+                $threadhold3 = $threadhold_items[2]; //missing
 
                 // echo $final_overlap.'  '.$threadhold1 .' - '. $final_missing.' '. $threadhold2 .' - '. $final_excess.'  '. $threadhold3;
 
                 // if is delineation
-                if ($answerId===1) {
+                if ($answerId === 1) {
                     //setting colors
                     if ($final_overlap >= $threadhold1) {
                         $overlap_color = true; //echo 'a';
@@ -321,40 +321,40 @@ 
 
                     // if pass
                     //if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold2 && $final_excess<=$threadhold3) {
-                    if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold3 && $final_excess<=$threadhold2) {
-                        $next=1; //go to the oars
-                        $result_comment=get_lang('Acceptable');
+                    if ($final_overlap >= $threadhold1 && $final_missing <= $threadhold3 && $final_excess <= $threadhold2) {
+                        $next = 1; //go to the oars
+                        $result_comment = get_lang('Acceptable');
                     } else {
-                        $next=1; //Go to the oars. If $next =  0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
+                        $next = 1; //Go to the oars. If $next =  0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
                         $wrong_results = true;
-                        $result_comment=get_lang('Unacceptable');
-                        $special_comment = $comment=$answerDestination=$objAnswerTmp->selectComment(1);
-                        $answerDestination=$objAnswerTmp->selectDestination(1);
-                        $destination_items= explode('@@', $answerDestination);
-                        $try_hotspot=$destination_items[1];
-                        $lp_hotspot=$destination_items[2];
-                        $select_question_hotspot=$destination_items[3];
-                        $url_hotspot=$destination_items[4];
+                        $result_comment = get_lang('Unacceptable');
+                        $special_comment = $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+                        $answerDestination = $objAnswerTmp->selectDestination(1);
+                        $destination_items = explode('@@', $answerDestination);
+                        $try_hotspot = $destination_items[1];
+                        $lp_hotspot = $destination_items[2];
+                        $select_question_hotspot = $destination_items[3];
+                        $url_hotspot = $destination_items[4];
                          //echo 'show the feedback';
                     }
-                } elseif($answerId>1) {
+                } elseif ($answerId > 1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
-                        if ($dbg_local>0) { error_log(__LINE__.' - answerId is of type noerror',0);}
+                        if ($dbg_local > 0) { error_log(__LINE__.' - answerId is of type noerror', 0); }
                         //type no error shouldn't be treated
                         $next = 1;
                         continue;
                     }
-                    if ($dbg_local>0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);}
+                    if ($dbg_local > 0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0); }
                     //check the intersection between the oar and the user
                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
                     //echo 'official';print_r($x_list);print_r($y_list);
                     //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
 
                     //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
-                    $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId); //getting the oars coordinates
+                    $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId); //getting the oars coordinates
 
-                    $poly_answer 			= convert_coordinates($delineation_cord,'|');
-                    $max_coord 				= poly_get_max($poly_user,$poly_answer); //getting max coordinates
+                    $poly_answer = convert_coordinates($delineation_cord, '|');
+                    $max_coord = poly_get_max($poly_user, $poly_answer); //getting max coordinates
                     $test = false;
                     // if ($answerId == 2 ){$test = true;} for test oars
 
@@ -362,9 +362,9 @@ 
                         $overlap = false;
                     } else {
                         //	poly_compile really works tested with gnuplot
-                        $poly_user_compiled	  	= poly_compile($poly_user,$max_coord,$test);//$poly_user is already set when answerid = 1
-                        $poly_answer_compiled 	= poly_compile($poly_answer,$max_coord,$test);
-                        $overlap 			  	= poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                        $poly_user_compiled	  	= poly_compile($poly_user, $max_coord, $test); //$poly_user is already set when answerid = 1
+                        $poly_answer_compiled 	= poly_compile($poly_answer, $max_coord, $test);
+                        $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
                     }
 
                     if ($overlap == false) {
@@ -372,42 +372,42 @@ 
                         $next = 1;
                         continue;
                     } else {
-                        if ($dbg_local>0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);}
+                        if ($dbg_local > 0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0); }
 
                         $organs_at_risk_hit++;
                         //show the feedback
-                        $next=1;
-                        $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
-                        $answerDestination=$objAnswerTmp->selectDestination($answerId);
-                        $destination_items= explode('@@', $answerDestination);
-                        $try_hotspot=$destination_items[1];
-                        $lp_hotspot=$destination_items[2];
-                        $select_question_hotspot=$destination_items[3];
-                        $url_hotspot=$destination_items[4];
+                        $next = 1;
+                        $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+                        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+                        $destination_items = explode('@@', $answerDestination);
+                        $try_hotspot = $destination_items[1];
+                        $lp_hotspot = $destination_items[2];
+                        $select_question_hotspot = $destination_items[3];
+                        $url_hotspot = $destination_items[4];
                     }
                 }
             } else {
                 // the first delineation feedback
-                if ($dbg_local>0) { error_log(__LINE__.' first',0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' first', 0); }
                 //we send the error
             }
         }
 	}
 
 	if ($overlap_color) {
-		$overlap_color='green';
+		$overlap_color = 'green';
     } else {
-		$overlap_color='red';
+		$overlap_color = 'red';
     }
 	if ($missing_color) {
-		$missing_color='green';
+		$missing_color = 'green';
     } else {
-		$missing_color='red';
+		$missing_color = 'red';
     }
 	if ($excess_color) {
-		$excess_color='green';
+		$excess_color = 'green';
     } else {
-		$excess_color='red';
+		$excess_color = 'red';
     }
 
     if (!is_numeric($final_overlap)) {
@@ -421,7 +421,7 @@ 
     	$final_excess = 0;
     }
 
-    if ($final_excess>100) {
+    if ($final_excess > 100) {
     	$final_excess = 100;
     }
 
@@ -436,26 +436,26 @@ 
 	<tr class="row_even">
 		<td><b>'.get_lang('Overlap').'</b></td>
 		<td>'.get_lang('Min').' '.$threadhold1.'</td>
-		<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0)?0:intval($final_overlap)).'</div></td>
+		<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
 	</tr>
 
 	<tr>
 		<td><b>'.get_lang('Excess').'</b></td>
 		<td>'.get_lang('Max').' '.$threadhold2.'</td>
-		<td><div style="color:'.$excess_color.'">'.(($final_excess < 0)?0:intval($final_excess)).'</div></td>
+		<td><div style="color:'.$excess_color.'">'.(($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
 	</tr>
 
 	<tr class="row_even">
 		<td><b>'.get_lang('Missing').'</b></td>
 		<td>'.get_lang('Max').' '.$threadhold3.'</td>
-		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
+		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
 	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
-$links='';
+$links = '';
 
 if (isset($choice_value) && $choice_value == -1) {
     if ($answerType != HOT_SPOT_DELINEATION) {
@@ -467,32 +467,32 @@ 
 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
-        $item_list = explode('@@',$destination);
+        $item_list = explode('@@', $destination);
     	//print_R($item_list);
     	$try = $item_list[0];
     	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+    	$destinationid = $item_list[2];
+    	$url = $item_list[3];
     }
-	$table_resume='';
+	$table_resume = '';
 } else {
 		$try = $try_hotspot;
 		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+		$destinationid = $select_question_hotspot;
+		$url = $url_hotspot;
+	if ($organs_at_risk_hit == 0 && $wrong_results == false) {
 		// no error = no oar and no wrong result for delineation
 		//show if no error
 		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+		$comment = $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+		$answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
 
 		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
+		$destination_items = explode('@@', $answerDestination);
+		$try = $destination_items[1];
+		$lp = $destination_items[2];
+		$destinationid = $destination_items[3];
+		$url = $destination_items[4];
 		$exerciseResult[$questionid] = 1;
 	} else {
 		$exerciseResult[$questionid] = 0;
@@ -500,35 +500,35 @@ 
 }
 
 // the link to retry the question
-if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+if (isset($try) && $try == 1) {
+	$num_value_array = (array_keys($questionList, $questionid));
+	$links .= Display :: return_icon('reload.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+	$lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
 	$list = new LearnpathList(api_get_user_id());
 	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+	$links .= Display :: return_icon('theory.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
-$links.='<br />';
+$links .= '<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+	$links .= Display :: return_icon('link.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
-if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+if ($destinationid == -1) {
+	$links .= Display :: return_icon('finish.gif', '', array('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
 	// the link to other question
-	if (in_array($destinationid,$questionList)) {
+	if (in_array($destinationid, $questionList)) {
 		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+		$questionName = $objQuestionTmp->selectTitle();
+		$num_value_array = (array_keys($questionList, $destinationid));
+		$links .= Display :: return_icon('quiz.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
 	}
 }
 
@@ -545,7 +545,7 @@ 
 }
 </script>';
 
-if ($links!='') {
+if ($links != '') {
 	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
 	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
@@ -554,15 +554,15 @@ 
 		if ($organs_at_risk_hit > 0) {
 			//$message='<p>'.get_lang('YourDelineation').'</p>';
 			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+			$message .= '<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
 			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
+			$message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+			$message .= '<p>'.$comment.'</p>';
 		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
+			$message = '<p>'.get_lang('YourDelineation').'</p>';
+			$message .= $table_resume;
+			$message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+			$message .= '<p>'.$comment.'</p>';
 		}
 		echo $message;
 	} else {
@@ -571,10 +571,10 @@ 
 	echo '<h3>'.$links.'</h3>';
 	echo '</div>';
 
-	$_SESSION['hot_spot_result']=$message;
+	$_SESSION['hot_spot_result'] = $message;
 	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
 	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
+	Session::write('exerciseResult', $exerciseResult);
 
 	//save this variables just in case the exercise loads an LP with other exercise
 	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];