chamilo / chamilo-lms

main/exercise/admin.php

Braces +3 added lines, -2 removed lines

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

Spacing +34 added lines, -34 removed lines

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

main/exercise/exercice.php

Spacing +1 added lines, -1 removed lines

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

main/exercise/MatchingDraggable.php

Spacing +14 added lines, -14 removed lines

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

main/exercise/multiple_answer_true_false.class.php

Indentation +19 added lines, -19 removed lines

@@ -241,13 +241,13 @@ 
     }
 
     /**
-	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param FormValidator $form
-	 */
+     * abstract function which creates the form to create / edit the answers of the question
+     * @param FormValidator $form
+     */
     public function processAnswersCreation($form)
     {
-		$questionWeighting = $nbrGoodAnswers = 0;
-		$objAnswer = new Answer($this->id);
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $objAnswer = new Answer($this->id);
         $nb_answers = $form->getSubmitValue('nb_answers');
         //$options_count    = $form->getSubmitValue('options_count');
         $course_id = api_get_course_int_id();
@@ -269,7 +269,7 @@ 
                     $course_id,
                     $i
                 );
-               $correct[$i] = $last_id;
+                $correct[$i] = $last_id;
             }
         }
 
@@ -280,7 +280,7 @@ 
 
         $sorted_by_position = array();
         foreach ($new_options as $item) {
-        	$sorted_by_position[$item['position']] = $item;
+            $sorted_by_position[$item['position']] = $item;
         }
 
         /* Saving quiz_question.extra values that has the correct scores of
@@ -293,7 +293,7 @@ 
         }
         $this->setExtra(implode(':', $extra_values));
 
-		for ($i = 1; $i <= $nb_answers; $i++) {
+        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.']'));
@@ -302,18 +302,18 @@ 
                 // change the default values from the form 1 and 2 by the correct "option id" registered
                 $goodAnswer = $sorted_by_position[$goodAnswer]['id'];
             }
-    	    $questionWeighting += $extra_values[0]; //By default 0 has the correct answers
+            $questionWeighting += $extra_values[0]; //By default 0 has the correct answers
 
-        	$objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
+            $objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
         }
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer->save();
 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
     /**
      * @param int $feedback_type
@@ -324,17 +324,17 @@ 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-  	    $header .= '<table class="'.$this->question_table_class .'">
+            $header .= '<table class="'.$this->question_table_class .'">
 		<tr>
 			<th>'.get_lang("Choice").'</th>
 			<th>'. get_lang("ExpectedChoice").'</th>
 			<th>'. get_lang("Answer").'</th>';
-			if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
-				$header .= '<th>'.get_lang("Comment").'</th>';
-			} else {
-				$header .= '<th>&nbsp;</th>';
-			}
+            if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+                $header .= '<th>'.get_lang("Comment").'</th>';
+            } else {
+                $header .= '<th>&nbsp;</th>';
+            }
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

Spacing +30 added lines, -30 removed lines

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

main/exercise/question.class.php

Braces +5 added lines, -4 removed lines

@@ -607,10 +607,11 @@
             $current_width = $current_image_size['width'];
             $current_height = $current_image_size['height'];
 
-            if ($current_width < $Max && $current_height < $Max)
-                return true;
-            elseif ($current_height == "")
-                return false;
+            if ($current_width < $Max && $current_height < $Max) {
+                            return true;
+            } elseif ($current_height == "") {
+                            return false;
+            }
 
             // Resize according to height.
             if ($Dimension == "height") {

Spacing +75 added lines, -75 removed lines

@@ -22,7 +22,7 @@ 
     public $type;
     public $level;
     public $picture;
-    public $exerciseList;  // array with the list of exercises which this question is in
+    public $exerciseList; // array with the list of exercises which this question is in
     public $category_list;
     public $parent_id;
     public $category;
@@ -47,8 +47,8 @@ 
             'multiple_answer_combination_true_false.class.php',
             'MultipleAnswerCombinationTrueFalse'
         ),
-        GLOBAL_MULTIPLE_ANSWER => array('global_multiple_answer.class.php' , 'GlobalMultipleAnswer'),
-        CALCULATED_ANSWER => array('calculated_answer.class.php' , 'CalculatedAnswer'),
+        GLOBAL_MULTIPLE_ANSWER => array('global_multiple_answer.class.php', 'GlobalMultipleAnswer'),
+        CALCULATED_ANSWER => array('calculated_answer.class.php', 'CalculatedAnswer'),
         UNIQUE_ANSWER_IMAGE => ['UniqueAnswerImage.php', 'UniqueAnswerImage'],
         DRAGGABLE => ['Draggable.php', 'Draggable'],
         MATCHING_DRAGGABLE => ['MatchingDraggable.php', 'MatchingDraggable']
@@ -107,14 +107,14 @@ 
         $id = intval($id);
 
         if (!empty($course_id)) {
-            $course_info =  api_get_course_info_by_id($course_id);
+            $course_info = api_get_course_info_by_id($course_id);
         } else {
             $course_info = api_get_course_info();
         }
 
         $course_id = $course_info['real_id'];
 
-        if (empty($course_id) || $course_id == -1 ) {
+        if (empty($course_id) || $course_id == -1) {
 
             return false;
         }
@@ -269,7 +269,7 @@ 
     public function selectPicturePath()
     {
         if (!empty($this->picture)) {
-            return api_get_path(WEB_COURSE_PATH) . $this->course['path'] . '/document/images/' . $this->picture;
+            return api_get_path(WEB_COURSE_PATH).$this->course['path'].'/document/images/'.$this->picture;
         }
 
         return '';
@@ -306,7 +306,7 @@ 
      */
     public function updateTitle($title)
     {
-        $this->question=$title;
+        $this->question = $title;
     }
 
     /**
@@ -405,7 +405,7 @@ 
                     // DO nothing
                 } else {
                     $sql = "INSERT INTO $TBL_QUESTION_REL_CATEGORY (c_id, question_id, category_id)
-                            VALUES (" . api_get_course_int_id() . ", $question_id, $category_id)";
+                            VALUES (".api_get_course_int_id().", $question_id, $category_id)";
                     Database::query($sql);
                 }
             }
@@ -432,7 +432,7 @@ 
             $sql = "SELECT count(*) AS nb FROM $table
                     WHERE
                         question_id = $question_id AND
-                        c_id=" . api_get_course_int_id();
+                        c_id=".api_get_course_int_id();
             $res = Database::query($sql);
             $row = Database::fetch_array($res);
             if ($row['nb'] > 0) {
@@ -440,11 +440,11 @@ 
                         SET category_id = $category_id
                         WHERE
                             question_id = $question_id AND
-                            c_id = " . api_get_course_int_id();
+                            c_id = ".api_get_course_int_id();
                 Database::query($sql);
             } else {
                 $sql = "INSERT INTO $table (c_id, question_id, category_id)
-                        VALUES (" . api_get_course_int_id().", $question_id, $category_id)";
+                        VALUES (".api_get_course_int_id().", $question_id, $category_id)";
                 Database::query($sql);
             }
         }
@@ -462,7 +462,7 @@ 
         $sql = "DELETE FROM $table
                 WHERE
                     question_id = $question_id AND
-                    c_id = " . api_get_course_int_id();
+                    c_id = ".api_get_course_int_id();
         Database::query($sql);
     }
 
@@ -515,11 +515,11 @@ 
             ) {
                 // removes old answers
                 $sql = "DELETE FROM $TBL_REPONSES
-                        WHERE c_id = $course_id AND question_id = " . intval($this->id);
+                        WHERE c_id = $course_id AND question_id = ".intval($this->id);
                 Database::query($sql);
             }
 
-            $this->type=$type;
+            $this->type = $type;
         }
     }
 
@@ -543,7 +543,7 @@ 
         if (!file_exists($picturePath)) {
             if (mkdir($picturePath, api_get_permissions_for_new_directories())) {
                 // document path
-                $documentPath = api_get_path(SYS_COURSE_PATH) . $this->course['path'] . "/document";
+                $documentPath = api_get_path(SYS_COURSE_PATH).$this->course['path']."/document";
                 $path = str_replace($documentPath, '', $picturePath);
                 $title_path = basename($picturePath);
                 $doc_id = add_document($this->course, $path, 'folder', 0, $title_path);
@@ -559,14 +559,14 @@ 
 
         // if the question has got an ID
         if ($this->id) {
-            $this->picture = 'quiz-' . $this->id . '.jpg';
+            $this->picture = 'quiz-'.$this->id.'.jpg';
             $o_img = new Image($Picture);
-            $o_img->send_image($picturePath . '/' . $this->picture, -1, 'jpg');
+            $o_img->send_image($picturePath.'/'.$this->picture, -1, 'jpg');
             $document_id = add_document(
                 $this->course,
-                '/images/' . $this->picture,
+                '/images/'.$this->picture,
                 'file',
-                filesize($picturePath . '/' . $this->picture),
+                filesize($picturePath.'/'.$this->picture),
                 $this->picture
             );
             if ($document_id) {
@@ -600,7 +600,7 @@ 
         // if the question has an ID
         if ($this->id) {
             // Get dimensions from current image.
-            $my_image = new Image($picturePath . '/' . $this->picture);
+            $my_image = new Image($picturePath.'/'.$this->picture);
 
             $current_image_size = $my_image->get_image_size();
             $current_width = $current_image_size['width'];
@@ -640,7 +640,7 @@ 
             }
 
             $my_image->resize($new_width, $new_height);
-            $result = $my_image->send_image($picturePath . '/' . $this->picture);
+            $result = $my_image->send_image($picturePath.'/'.$this->picture);
 
             if ($result) {
                 return true;
@@ -665,7 +665,7 @@ 
             $picture = $this->picture;
             $this->picture = '';
 
-            return @unlink($picturePath . '/' . $picture) ? true : false;
+            return @unlink($picturePath.'/'.$picture) ? true : false;
         }
 
         return false;
@@ -682,27 +682,27 @@ 
     {
         $course_id = $course_info['real_id'];
         $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-        $destination_path = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document/images';
-        $source_path = api_get_path(SYS_COURSE_PATH) . $this->course['path'] . '/document/images';
+        $destination_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document/images';
+        $source_path = api_get_path(SYS_COURSE_PATH).$this->course['path'].'/document/images';
 
         // if the question has got an ID and if the picture exists
         if ($this->id && !empty($this->picture)) {
             $picture = explode('.', $this->picture);
             $extension = $picture[sizeof($picture) - 1];
-            $picture = 'quiz-' . $questionId . '.' . $extension;
-            $result = @copy($source_path . '/' . $this->picture, $destination_path . '/' . $picture) ? true : false;
+            $picture = 'quiz-'.$questionId.'.'.$extension;
+            $result = @copy($source_path.'/'.$this->picture, $destination_path.'/'.$picture) ? true : false;
             // If copy was correct then add to the database
             if ($result) {
                 $sql = "UPDATE $TBL_QUESTIONS SET
-                        picture = '" . Database::escape_string($picture) . "'
-                        WHERE c_id = $course_id AND id='" . intval($questionId) . "'";
+                        picture = '".Database::escape_string($picture)."'
+                        WHERE c_id = $course_id AND id='".intval($questionId)."'";
                 Database::query($sql);
 
                 $document_id = add_document(
                     $course_info,
-                    '/images/' . $picture,
+                    '/images/'.$picture,
                     'file',
-                    filesize($destination_path . '/' . $picture),
+                    filesize($destination_path.'/'.$picture),
                     $picture
                 );
                 if ($document_id) {
@@ -737,7 +737,7 @@ 
         $Extension = $PictureName[sizeof($PictureName) - 1];
 
         // saves the picture into a temporary file
-        @move_uploaded_file($Picture, $picturePath . '/tmp.' . $Extension);
+        @move_uploaded_file($Picture, $picturePath.'/tmp.'.$Extension);
     }
 
     /**
@@ -771,15 +771,15 @@ 
 
         // if the question has got an ID and if the picture exists
         if ($this->id) {
-            if (file_exists($picturePath . '/tmp.jpg')) {
+            if (file_exists($picturePath.'/tmp.jpg')) {
                 $Extension = 'jpg';
-            } elseif (file_exists($picturePath . '/tmp.gif')) {
+            } elseif (file_exists($picturePath.'/tmp.gif')) {
                 $Extension = 'gif';
-            } elseif (file_exists($picturePath . '/tmp.png')) {
+            } elseif (file_exists($picturePath.'/tmp.png')) {
                 $Extension = 'png';
             }
-            $this->picture = 'quiz-' . $this->id . '.' . $Extension;
-            return @rename($picturePath . '/tmp.' . $Extension, $picturePath . '/' . $this->picture) ? true : false;
+            $this->picture = 'quiz-'.$this->id.'.'.$Extension;
+            return @rename($picturePath.'/tmp.'.$Extension, $picturePath.'/'.$this->picture) ? true : false;
         }
         return false;
     }
@@ -809,7 +809,7 @@ 
         $category = $this->category;
 
         // question already exists
-        if(!empty($id)) {
+        if (!empty($id)) {
 
             $params = [
                 'question' => $question,
@@ -855,12 +855,12 @@ 
                     $TBL_EXERCISE_QUESTION as test_question
                     WHERE
                         question.id = test_question.question_id AND
-                        test_question.exercice_id = " . intval($exerciseId) . " AND
+                        test_question.exercice_id = ".intval($exerciseId)." AND
                         question.c_id = $c_id AND
                         test_question.c_id = $c_id ";
-            $result	= Database::query($sql);
-            $current_position = Database::result($result,0,0);
-            $this->updatePosition($current_position+1);
+            $result = Database::query($sql);
+            $current_position = Database::result($result, 0, 0);
+            $this->updatePosition($current_position + 1);
             $position = $this->position;
 
             $params = [
@@ -956,10 +956,10 @@ 
         }
     }
 
-    public function search_engine_edit($exerciseId, $addQs=false, $rmQs=false)
+    public function search_engine_edit($exerciseId, $addQs = false, $rmQs = false)
     {
         // update search engine and its values table if enabled
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
             // get search_did
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
@@ -977,8 +977,8 @@ 
             $res = Database::query($sql);
 
             if (Database::num_rows($res) > 0 || $addQs) {
-                require_once(api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php');
-                require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php');
 
                 $di = new ChamiloIndexer();
                 if ($addQs) {
@@ -991,7 +991,7 @@ 
 
                 // retrieve others exercise ids
                 $se_ref = Database::fetch_array($res);
-                $se_doc = $di->get_document((int)$se_ref['search_did']);
+                $se_doc = $di->get_document((int) $se_ref['search_did']);
                 if ($se_doc !== FALSE) {
                     if (($se_doc_data = $di->get_document_data($se_doc)) !== FALSE) {
                         $se_doc_data = unserialize($se_doc_data);
@@ -1029,16 +1029,16 @@ 
                     SE_DATA => array(
                         'type' => SE_DOCTYPE_EXERCISE_QUESTION,
                         'exercise_ids' => $question_exercises,
-                        'question_id' => (int)$this->id
+                        'question_id' => (int) $this->id
                     ),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_USER => (int) api_get_user_id(),
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
                 $ic_slide->addValue("content", $this->description);
 
                 //TODO: index answers, see also form validation on question_admin.inc.php
 
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 //index and return search engine document id
@@ -1117,7 +1117,7 @@ 
             $count = $new_exercise->selectNbrQuestions();
             $count++;
             $sql = "INSERT INTO $exerciseRelQuestionTable (c_id, question_id, exercice_id, question_order)
-                    VALUES ({$this->course['real_id']}, " . intval($id) . ", " . intval($exerciseId) . ", '$count')";
+                    VALUES ({$this->course['real_id']}, ".intval($id).", ".intval($exerciseId).", '$count')";
             Database::query($sql);
 
             // we do not want to reindex if we had just saved adnd indexed the question
@@ -1146,7 +1146,7 @@ 
         $course_id = api_get_course_int_id();
 
         // exercise not found
-        if($pos === false) {
+        if ($pos === false) {
             return false;
         } else {
             // deletes the position in the array containing the wanted exercise ID
@@ -1156,17 +1156,17 @@ 
                     FROM $TBL_EXERCISE_QUESTION
                     WHERE
                         c_id = $course_id
-                        AND question_id = " . intval($id) . "
+                        AND question_id = ".intval($id)."
                         AND exercice_id = " . intval($exerciseId);
             $res = Database::query($sql);
-            if (Database::num_rows($res)>0) {
+            if (Database::num_rows($res) > 0) {
                 $row = Database::fetch_array($res);
                 if (!empty($row['question_order'])) {
                     $sql = "UPDATE $TBL_EXERCISE_QUESTION
                         SET question_order = question_order-1
                         WHERE
                             c_id = $course_id
-                            AND exercice_id = " . intval($exerciseId) . "
+                            AND exercice_id = ".intval($exerciseId)."
                             AND question_order > " . $row['question_order'];
                     Database::query($sql);
                 }
@@ -1175,7 +1175,7 @@ 
             $sql = "DELETE FROM $TBL_EXERCISE_QUESTION
                     WHERE
                         c_id = $course_id
-                        AND question_id = " . intval($id) . "
+                        AND question_id = ".intval($id)."
                         AND exercice_id = " . intval($exerciseId);
             Database::query($sql);
 
@@ -1216,7 +1216,7 @@ 
                                 SET question_order = question_order-1
                                 WHERE
                                     c_id= $course_id
-                                    AND exercice_id = " . intval($row['exercice_id']) . "
+                                    AND exercice_id = ".intval($row['exercice_id'])."
                                     AND question_order > " . $row['question_order'];
                         Database::query($sql);
                     }
@@ -1224,22 +1224,22 @@ 
             }
 
             $sql = "DELETE FROM $TBL_EXERCISE_QUESTION
-                    WHERE c_id = $course_id AND question_id = " . $id;
+                    WHERE c_id = $course_id AND question_id = ".$id;
             Database::query($sql);
 
             $sql = "DELETE FROM $TBL_QUESTIONS
-                    WHERE c_id = $course_id AND id = " . $id;
+                    WHERE c_id = $course_id AND id = ".$id;
             Database::query($sql);
 
             $sql = "DELETE FROM $TBL_REPONSES
-                    WHERE c_id = $course_id AND question_id = " . $id;
+                    WHERE c_id = $course_id AND question_id = ".$id;
             Database::query($sql);
 
             // remove the category of this question in the question_rel_category table
             $sql = "DELETE FROM $TBL_QUIZ_QUESTION_REL_CATEGORY
                     WHERE 
                         c_id = $course_id AND 
-                        question_id = " . $id;
+                        question_id = ".$id;
             Database::query($sql);
 
             api_item_property_update(
@@ -1408,7 +1408,7 @@ 
                 if (class_exists($class_name)) {
                     return new $class_name();
                 } else {
-                    echo 'Can\'t instanciate class ' . $class_name . ' of type ' . $type;
+                    echo 'Can\'t instanciate class '.$class_name.' of type '.$type;
                 }
             }
         }
@@ -1450,7 +1450,7 @@ 
 
         // Question type
         $answerType = isset($_REQUEST['answerType']) ? intval($_REQUEST['answerType']) : null;
-        $form->addElement('hidden','answerType', $answerType);
+        $form->addElement('hidden', 'answerType', $answerType);
 
         // html editor
         $editorConfig = array(
@@ -1458,7 +1458,7 @@ 
             'Height' => '150'
         );
 
-        if (!api_is_allowed_to_edit(null,true)) {
+        if (!api_is_allowed_to_edit(null, true)) {
             $editorConfig['UserStatus'] = 'student';
         }
 
@@ -1595,7 +1595,7 @@ 
 
         if ($feedback_type == 1) {
             //2. but if it is a feedback DIRECT we only show the UNIQUE_ANSWER type that is currently available
-            $question_type_custom_list = array (
+            $question_type_custom_list = array(
                 UNIQUE_ANSWER => self::$questionTypes[UNIQUE_ANSWER],
                 HOT_SPOT_DELINEATION => self::$questionTypes[HOT_SPOT_DELINEATION]
             );
@@ -1611,14 +1611,14 @@ 
             require_once $a_type[0];
             // get the picture of the type and the langvar which describes it
             $img = $explanation = '';
-            eval('$img = ' . $a_type[1] . '::$typePicture;');
-            eval('$explanation = get_lang(' . $a_type[1] . '::$explanationLangVar);');
+            eval('$img = '.$a_type[1].'::$typePicture;');
+            eval('$explanation = get_lang('.$a_type[1].'::$explanationLangVar);');
             echo '<li>';
             echo '<div class="icon-image">';
 
 
-            $icon = '<a href="admin.php?' . api_get_cidreq() . '&newQuestion=yes&answerType=' . $i . '">' .
-                Display::return_icon($img, $explanation, null, ICON_SIZE_BIG) . '</a>';
+            $icon = '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.
+                Display::return_icon($img, $explanation, null, ICON_SIZE_BIG).'</a>';
 
             if ($objExercise->force_edit_exercise_in_lp === false) {
                 if ($objExercise->exercise_was_added_in_lp == true) {
@@ -1639,9 +1639,9 @@ 
             echo Display::return_icon('database_na.png', get_lang('GetExistingQuestion'), null, ICON_SIZE_BIG);
         } else {
             if ($feedback_type == 1) {
-                echo $url = "<a href=\"question_pool.php?" . api_get_cidreq() . "&type=1&fromExercise=$exerciseId\">";
+                echo $url = "<a href=\"question_pool.php?".api_get_cidreq()."&type=1&fromExercise=$exerciseId\">";
             } else {
-                echo $url = '<a href="question_pool.php?' . api_get_cidreq() . '&fromExercise=' . $exerciseId . '">';
+                echo $url = '<a href="question_pool.php?'.api_get_cidreq().'&fromExercise='.$exerciseId.'">';
             }
             echo Display::return_icon('database.png', get_lang('GetExistingQuestion'), null, ICON_SIZE_BIG);
         }
@@ -1778,7 +1778,7 @@ 
             $header .= $this->show_media_content();
         }
 
-        $header .= Display::page_subheader2($counter_label . ". " . $question_title);
+        $header .= Display::page_subheader2($counter_label.". ".$question_title);
         $header .= Display::div(
             "<div class=\"rib rib-$class\"><h3>$score_label</h3></div> <h4>{$score['result']}</h4>",
             array('class' => 'ribbon')
@@ -1800,7 +1800,7 @@ 
     public function create_question(
         $quiz_id,
         $question_name,
-        $question_description = "" ,
+        $question_description = "",
         $max_score = 0,
         $type = 1,
         $level = 1
@@ -1870,8 +1870,8 @@ 
         require_once $tabQuestionList[$type][0];
 
         $img = $explanation = null;
-        eval('$img = ' . $tabQuestionList[$type][1] . '::$typePicture;');
-        eval('$explanation = get_lang(' . $tabQuestionList[$type][1] . '::$explanationLangVar);');
+        eval('$img = '.$tabQuestionList[$type][1].'::$typePicture;');
+        eval('$explanation = get_lang('.$tabQuestionList[$type][1].'::$explanationLangVar);');
         return array($img, $explanation);
     }
 
@@ -1936,7 +1936,7 @@ 
         $media_list[0] = get_lang('NoMedia');
 
         if (!empty($medias)) {
-            foreach($medias as $media) {
+            foreach ($medias as $media) {
                 $media_list[$media['id']] = empty($media['question']) ? get_lang('Untitled') : $media['question'];
             }
         }

main/exercise/hotspot_save.inc.php

Indentation +16 added lines, -16 removed lines

@@ -15,24 +15,24 @@
 $answerId 	= intval($_GET['answerId']);
 
 if ($_GET['type'] == "square" || $_GET['type'] == "circle") {
-	$hotspot_type = $_GET['type'];
-	$hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height'];
+    $hotspot_type = $_GET['type'];
+    $hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height'];
 }
 if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") {
-	$hotspot_type = $_GET['type'];
-	$tmp_coord = explode(",",$_GET['co']);
-	$i = 0;
-	$hotspot_coordinates = "";
-	foreach ($tmp_coord as $coord) {
-		if ($i%2 == 0) {
-			$delimiter = ";";
-		} else {
-			$delimiter = "|";
-		}
-		$hotspot_coordinates .= $coord.$delimiter;
-		$i++;
-	}
-	$hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
+    $hotspot_type = $_GET['type'];
+    $tmp_coord = explode(",",$_GET['co']);
+    $i = 0;
+    $hotspot_coordinates = "";
+    foreach ($tmp_coord as $coord) {
+        if ($i%2 == 0) {
+            $delimiter = ";";
+        } else {
+            $delimiter = "|";
+        }
+        $hotspot_coordinates .= $coord.$delimiter;
+        $i++;
+    }
+    $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
 }
 $course_id = api_get_course_int_id();
 $sql = "UPDATE $TBL_ANSWER SET

Spacing +4 added lines, -4 removed lines

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

main/exercise/unique_answer_no_option.class.php

Braces +13 added lines, -10 removed lines

@@ -146,15 +146,17 @@ 
                     $list_dest = $item_list[2];
                     $url = $item_list[3];
 
-                    if ($try == 0)
-                        $try_result = 0;
-                    else
-                        $try_result = 1;
+                    if ($try == 0) {
+                                            $try_result = 0;
+                    } else {
+                                            $try_result = 1;
+                    }
 
-                    if ($url == 0)
-                        $url_result = '';
-                    else
-                        $url_result = $url;
+                    if ($url == 0) {
+                                            $url_result = '';
+                    } else {
+                                            $url_result = $url;
+                    }
 
                     $temp_scenario['url' . $i] = $url_result;
                     $temp_scenario['try' . $i] = $try_result;
@@ -343,8 +345,9 @@ 
                 }
         	}
 
- 			if (empty($try))
- 				$try=0;
+ 			if (empty($try)) {
+ 			 				$try=0;
+ 			}
 
  			if (empty($lp)) {
  				$lp=0;

Indentation +61 added lines, -61 removed lines

@@ -14,20 +14,20 @@ 
  */
 class UniqueAnswerNoOption extends Question
 {
-	public static $typePicture = 'mcuao.png';
-	public static $explanationLangVar = 'UniqueAnswerNoOption';
+    public static $typePicture = 'mcuao.png';
+    public static $explanationLangVar = 'UniqueAnswerNoOption';
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
+    /**
+     * Constructor
+     */
+    public function __construct()
     {
-		parent::__construct();
-		$this -> type = UNIQUE_ANSWER_NO_OPTION;
-		$this -> isContent = $this-> getIsContent();
-	}
+        parent::__construct();
+        $this -> type = UNIQUE_ANSWER_NO_OPTION;
+        $this -> isContent = $this-> getIsContent();
+    }
 
-	/**
+    /**
      * function which redifines Question::createAnswersForm
      * @param the formvalidator instance
      * @param the answers number to display
@@ -283,37 +283,37 @@ 
     }
 
     /**
-	 * Function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function processAnswersCreation($form)
+     * Function which creates the form to create / edit the answers of the question
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function processAnswersCreation($form)
     {
-		$questionWeighting = $nbrGoodAnswers = 0;
-		$correct = $form -> getSubmitValue('correct');
-		$objAnswer = new Answer($this->id);
-		$nb_answers = $form -> getSubmitValue('nb_answers');
-		$minus = 1;
-		if ($form -> getSubmitValue('new_question')) {
-		    $minus = 0;
-		}
-
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $correct = $form -> getSubmitValue('correct');
+        $objAnswer = new Answer($this->id);
+        $nb_answers = $form -> getSubmitValue('nb_answers');
+        $minus = 1;
+        if ($form -> getSubmitValue('new_question')) {
+            $minus = 0;
+        }
+
+        for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
+            $position   = trim($form -> getSubmitValue('position['.$i.']'));
+            $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
 
-           	//$list_destination = $form -> getSubmitValue('destination'.$i);
-           	//$destination_str = $form -> getSubmitValue('destination'.$i);
+                //$list_destination = $form -> getSubmitValue('destination'.$i);
+                //$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
+                $try           = $scenario['try'.$i];
             $lp            = $scenario['lp'.$i];
- 			$destination   = $scenario['destination'.$i];
- 			$url           = trim($scenario['url'.$i]);
+                $destination   = $scenario['destination'.$i];
+                $url           = trim($scenario['url'.$i]);
 
- 			/*
+                /*
  			How we are going to parse the destination value
 
 			here we parse the destination value which is a string
@@ -326,41 +326,41 @@ 
 			selected_questions= ids of questions
 			url= an url
 			*/
-			/*
+            /*
  			$destination_str='';
  			foreach ($list_destination as $destination_id)
  			{
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+            $goodAnswer= ($correct == $i) ? true : false;
 
-        	if ($goodAnswer) {
-        		$nbrGoodAnswers++;
-        		$weighting = abs($weighting);
-        		if($weighting > 0) {
+            if ($goodAnswer) {
+                $nbrGoodAnswers++;
+                $weighting = abs($weighting);
+                if($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
-        	}
+            }
 
- 			if (empty($try))
- 				$try=0;
+                if (empty($try))
+                    $try=0;
 
- 			if (empty($lp)) {
- 				$lp=0;
- 			}
+                if (empty($lp)) {
+                    $lp=0;
+                }
 
- 			if (empty($destination)) {
- 				$destination=0;
- 			}
+                if (empty($destination)) {
+                    $destination=0;
+                }
 
- 			if ($url=='') {
- 				$url=0;
- 			}
+                if ($url=='') {
+                    $url=0;
+                }
 
- 			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+                //1@@1;2;@@2;4;4;@@http://www.chamilo.org
+            $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+            $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
         }
 
         //Create 666 answer
@@ -373,18 +373,18 @@ 
 
         $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer -> save();
 
         // sets the total weighting of the question
         $this -> updateWeighting($questionWeighting);
         $this -> save();
-	}
+    }
 
-	function return_header($feedback_type = null, $counter = null, $score = null)
+    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 = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -392,5 +392,5 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

Spacing +52 added lines, -52 removed lines

@@ -39,7 +39,7 @@ 
 
         $editor_config = array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '125');
         //this line define how many question by default appear when creating a choice question
-        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3;  // The previous default value was 2. See task #1759.
+        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3; // The previous default value was 2. See task #1759.
         $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
 
         /*
@@ -55,20 +55,20 @@ 
         if ($obj_ex->selectFeedbackType() == 1) {
             $editor_config['Width'] = '250';
             $editor_config['Height'] = '110';
-            $comment_title = '<th width="50%" >' . get_lang('Comment') . '</th>';
-            $feedback_title = '<th width="50%" >' . get_lang('Scenario') . '</th>';
+            $comment_title = '<th width="50%" >'.get_lang('Comment').'</th>';
+            $feedback_title = '<th width="50%" >'.get_lang('Scenario').'</th>';
         } else {
-            $comment_title = '<th width="50%">' . get_lang('Comment') . '</th>';
+            $comment_title = '<th width="50%">'.get_lang('Comment').'</th>';
         }
 
         $html = '<table class="table table-striped table-hover">';
         $html .= '<thead>';
         $html .= '<tr>';
-        $html .= '<th>' . get_lang('Number') . '</th>';
-        $html .= '<th>' . get_lang('True') . '</th>';
-        $html .= '<th width="50%">' . get_lang('Answer') . '</th>';
-        $html .= $comment_title . $feedback_title;
-        $html .= '<th>' . get_lang('Weighting') . '</th>';
+        $html .= '<th>'.get_lang('Number').'</th>';
+        $html .= '<th>'.get_lang('True').'</th>';
+        $html .= '<th width="50%">'.get_lang('Answer').'</th>';
+        $html .= $comment_title.$feedback_title;
+        $html .= '<th>'.get_lang('Weighting').'</th>';
         $html .= '</tr>';
         $html .= '</thead>';
         $html .= '<tbody>';
@@ -135,9 +135,9 @@ 
                         $weight_result = '0';
                     }
 
-                    $defaults['answer[' . $i . ']'] = $answer_result;
-                    $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                    $defaults['weighting[' . $i . ']'] = $weight_result;
+                    $defaults['answer['.$i.']'] = $answer_result;
+                    $defaults['comment['.$i.']'] = $answer->comment[$i];
+                    $defaults['weighting['.$i.']'] = $weight_result;
 
                     $item_list = explode('@@', $answer->destination[$i]);
 
@@ -156,10 +156,10 @@ 
                     else
                         $url_result = $url;
 
-                    $temp_scenario['url' . $i] = $url_result;
-                    $temp_scenario['try' . $i] = $try_result;
-                    $temp_scenario['lp' . $i] = $lp;
-                    $temp_scenario['destination' . $i] = $list_dest;
+                    $temp_scenario['url'.$i] = $url_result;
+                    $temp_scenario['try'.$i] = $try_result;
+                    $temp_scenario['lp'.$i] = $lp;
+                    $temp_scenario['destination'.$i] = $list_dest;
                 }
             }
 
@@ -172,30 +172,30 @@ 
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'weighting[' . $i . ']'
+                '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('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
-            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), $editor_config);
+            $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
 
-            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), $editor_config);
-            $form->addElement('text', 'weighting[' . $i . ']', null, array('style' => 'width: 60px;', 'value' => '0'));
+            $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
+            $form->addElement('text', 'weighting['.$i.']', null, array('style' => 'width: 60px;', 'value' => '0'));
             $form->addElement('html', '</tr>');
             $i++;
         }
@@ -210,8 +210,8 @@ 
         $form->addHtml('<tr>');
 
         $defaults["counter[$i]"] = '-';
-        $defaults['answer[' . $i . ']'] = get_lang('DontKnow');
-        $defaults['weighting[' . $i . ']'] = '0';
+        $defaults['answer['.$i.']'] = get_lang('DontKnow');
+        $defaults['weighting['.$i.']'] = '0';
         $defaults['scenario'] = $temp_scenario;
         $renderer = & $form->defaultRenderer();
 
@@ -221,32 +221,32 @@ 
         );
         $renderer->setElementTemplate(
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-            'counter[' . $i . ']'
+            'counter['.$i.']'
         );
         $renderer->setElementTemplate(
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-            'answer[' . $i . ']'
+            'answer['.$i.']'
         );
         $renderer->setElementTemplate(
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-            'comment[' . $i . ']'
+            'comment['.$i.']'
         );
         $renderer->setElementTemplate(
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-            'weighting[' . $i . ']'
+            'weighting['.$i.']'
         );
 
         $form
-            ->addElement('text', 'counter[' . $i . ']', null)
+            ->addElement('text', 'counter['.$i.']', null)
             ->freeze();
 
-        $form->addElement('hidden', 'position[' . $i . ']', '666');
+        $form->addElement('hidden', 'position['.$i.']', '666');
 
         $form->addElement('radio', 'correct', null, null, $i, ['class' => 'checkbox', 'disabled' => true]);
-        $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), $editor_config);
+        $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
 
-        $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
-        $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), $editor_config);
+        $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
 
         //$form->addElement('select', 'destination'.$i, get_lang('SelectQuestion').' : ',$select_question,'multiple');
 
@@ -302,9 +302,9 @@ 
 		    $minus = 0;
 		}
 
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+		for ($i = 1; $i <= $nb_answers - $minus; $i++) {
+		    $position = trim($form -> getSubmitValue('position['.$i.']'));
+        	$answer = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
@@ -312,8 +312,8 @@ 
            	//$list_destination = $form -> getSubmitValue('destination'.$i);
            	//$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
-            $lp            = $scenario['lp'.$i];
+ 		    $try = $scenario['try'.$i];
+            $lp = $scenario['lp'.$i];
  			$destination   = $scenario['destination'.$i];
  			$url           = trim($scenario['url'.$i]);
 
@@ -337,34 +337,34 @@ 
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+        	$goodAnswer = ($correct == $i) ? true : false;
 
         	if ($goodAnswer) {
         		$nbrGoodAnswers++;
         		$weighting = abs($weighting);
-        		if($weighting > 0) {
+        		if ($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
         	}
 
  			if (empty($try))
- 				$try=0;
+ 				$try = 0;
 
  			if (empty($lp)) {
- 				$lp=0;
+ 				$lp = 0;
  			}
 
  			if (empty($destination)) {
- 				$destination=0;
+ 				$destination = 0;
  			}
 
- 			if ($url=='') {
- 				$url=0;
+ 			if ($url == '') {
+ 				$url = 0;
  			}
 
  			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+			$dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+        	$objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i, NULL, NULL, $dest);
         }
 
         //Create 666 answer
@@ -372,10 +372,10 @@ 
         $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
         $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
         $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
-        $goodAnswer= ($correct == $i) ? true : false;
+        $goodAnswer = ($correct == $i) ? true : false;
         $dest       = '';
 
-        $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+        $objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i, NULL, NULL, $dest);
 
     	// saves the answers into the data base
         $objAnswer -> save();
@@ -388,7 +388,7 @@ 
 	function return_header($feedback_type = null, $counter = null, $score = null)
     {
 	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+	    $header .= '<table class="'.$this->question_table_class.'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>

main/exercise/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) . 'exercise/admin.php?' . api_get_cidreq() . '&exerciseId=' . $exerciseId;
+$hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercise/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) {
@@ -565,14 +565,14 @@ 
 
     Display::tag(
         'h3',
-        get_lang('Question') . ": " . $questionName . Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
+        get_lang('Question').": ".$questionName.Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
     );
 
     if (!empty($msgErr)) {
         Display::display_normal_message($msgErr); //main API
     }
 
-    $hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercise/admin.php?' . api_get_cidreq() . '&hotspotadmin=' . $modifyAnswers . '&exerciseId=' . $exerciseId . '&' . api_get_cidreq();
+    $hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercise/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">
@@ -611,7 +611,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
@@ -643,36 +643,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
@@ -688,9 +688,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>
@@ -734,7 +734,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>
@@ -787,7 +787,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>
@@ -852,7 +852,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>
@@ -892,12 +892,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);
@@ -906,7 +906,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>
@@ -945,36 +945,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) {
@@ -1065,6 +1065,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 +29 added lines, -11 removed lines

@@ -679,12 +679,15 @@ 
                                     $option1 = $option2 = $option3 = '';
                                     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 +734,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 +790,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 +832,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 +861,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 +1013,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/exercise/upload_exercise.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-require_once api_get_path(LIBRARY_PATH) . 'pear/excelreader/reader.php';
+require_once api_get_path(LIBRARY_PATH).'pear/excelreader/reader.php';
 
 // Security check
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -59,14 +59,14 @@ 
 function lp_upload_quiz_actions()
 {
     $return = '<a href="exercise.php?'.api_get_cidReq().'">'.
-        Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     return $return;
 }
 
 function lp_upload_quiz_secondary_actions()
 {
-    $return = '<a href="exercise_report.php?' . api_get_cidreq() . '">' .
-        Display :: return_icon('reporting32.png', get_lang('Tracking')) . get_lang('Tracking') . '</a>';
+    $return = '<a href="exercise_report.php?'.api_get_cidreq().'">'.
+        Display :: return_icon('reporting32.png', get_lang('Tracking')).get_lang('Tracking').'</a>';
     return $return;
 }
 
@@ -104,7 +104,7 @@ 
     $table->setHeaderContents(0, 1, '#');
 
     $row = 1;
-    foreach ($tableList as $key => $label ) {
+    foreach ($tableList as $key => $label) {
         $table->setCellContents($row, 0, $label);
         $table->setCellContents($row, 1, $key);
         $row++;
@@ -443,7 +443,7 @@ 
                                     $comment = $feedback_true_list[$i][2];
                                 } else {
                                     $comment = $feedback_false_list[$i][2];
-                                    $floatVal = (float)$answer_data[3];
+                                    $floatVal = (float) $answer_data[3];
                                     if (is_numeric($floatVal)) {
                                         $score = $answer_data[3];
                                     }