chamilo / chamilo-lms

main/exercise/hotspot_actionscript_admin.as.php

Indentation +4 added lines, -4 removed lines

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

Spacing +5 added lines, -5 removed lines

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

main/exercise/question_list_admin.inc.php

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

Spacing +15 added lines, -16 removed lines

@@ -136,7 +136,7 @@ 
             .sortable({
                 cursor: "move", // works?
                 update: function(event, ui) {
-                    var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']);?>";
+                    var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']); ?>";
                     $.post("<?php echo $ajax_url ?>", order, function(reponse){
                         $("#message").html(reponse);
                     });
@@ -172,12 +172,12 @@ 
     echo "<div class='table-responsive'>";
     echo "<table class='table table-condensed'>";
     echo "<tr>";
-    echo "<th style=\"width: 40%;\">" .get_lang('Questions'). "</th>";
-    echo "<th style=\"width: 10%;\">" .get_lang('Type'). "</th>";
-    echo "<th style=\"width: 20%;\">" .get_lang('Category'). "</th>";
-    echo "<th style=\"width: 10%;\">" .get_lang('Difficulty'). "</th>";
-    echo "<th style=\"width: 10%;\">" .get_lang('Score'). "</th>";
-    echo "<th style=\"width: 10%;\">" .get_lang('Actions'). "</th>";
+    echo "<th style=\"width: 40%;\">".get_lang('Questions')."</th>";
+    echo "<th style=\"width: 10%;\">".get_lang('Type')."</th>";
+    echo "<th style=\"width: 20%;\">".get_lang('Category')."</th>";
+    echo "<th style=\"width: 10%;\">".get_lang('Difficulty')."</th>";
+    echo "<th style=\"width: 10%;\">".get_lang('Score')."</th>";
+    echo "<th style=\"width: 10%;\">".get_lang('Actions')."</th>";
     echo "</tr>";
     echo "</table>";
     echo "</div>";
@@ -217,15 +217,14 @@ 
                 $question_class = get_class($objQuestionTmp);
 
                 $clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.
-                    Display::return_icon('cd.png',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
+                    Display::return_icon('cd.png', get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
                 $edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ?
                     '<a>'.Display::return_icon(
                         'edit_na.png',
                         get_lang('QuestionEditionNotAvailableBecauseItIsAlreadyAnsweredHoweverYouCanCopyItAndModifyTheCopy'),
                         array(),
                         ICON_SIZE_SMALL
-                    ).'</a>' :
-                    '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
+                    ).'</a>' : '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
                     $objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.
                     Display::return_icon(
                         'edit.png',
@@ -235,17 +234,17 @@ 
                     ).'</a>';
                 $delete_link = null;
                 if ($objExercise->edit_exercise_in_lp == true) {
-                    $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
+                    $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png', get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
                 }
                 
-                $edit_link = Display::tag('span', $edit_link,   array('class'=>'items'));
-                $clone_link = Display::tag('span', $clone_link,  array('class'=>'items'));
+                $edit_link = Display::tag('span', $edit_link, array('class'=>'items'));
+                $clone_link = Display::tag('span', $clone_link, array('class'=>'items'));
                 $delete_link = Display::tag('span', $delete_link, array('class'=>'items'));
-                $btnActions = Display::tag('td',Display::tag(
+                $btnActions = Display::tag('td', Display::tag(
                     'div',
                     $edit_link.$clone_link.$delete_link,
                     array('class'=>'edition')
-                ), array ('class'=>'btn-actions'));
+                ), array('class'=>'btn-actions'));
 
                 $title = Security::remove_XSS($objQuestionTmp->selectTitle());
                 /* $move = Display::return_icon(
@@ -285,7 +284,7 @@ 
                 $questionScore = Display::tag('td', $objQuestionTmp->selectWeighting(), array('class'=>$styleScore));
 
                 echo '<div id="question_id_list_'.$id.'" >';
-                echo '<div class="header_operations" data-exercise="' . $objExercise->selectId() . '" data-question="' . $id . '">';
+                echo '<div class="header_operations" data-exercise="'.$objExercise->selectId().'" data-question="'.$id.'">';
                 echo "<div class='table-responsive'>";
                 echo "<table class='table'>";
                 echo "<tr>";

main/exercise/evalmathnotation.php

Spacing +1 added lines, -1 removed lines

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

main/exercise/calculated_answer.class.php

Spacing +9 added lines, -10 removed lines

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

main/exercise/hotspot.inc.php

Indentation +6 added lines, -6 removed lines

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

Spacing +1 added lines, -1 removed lines

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

main/exercise/overview.php

Indentation +1 added lines, -1 removed lines

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

Braces +1 added lines, -2 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-$current_course_tool  = TOOL_QUIZ;
+$current_course_tool = TOOL_QUIZ;
 
 // Clear the exercise session just in case
 Session::erase('objExercise');
@@ -47,7 +47,7 @@ 
 
 if ($time_control) {
     // Get time left for expiring time
-    $time_left = api_strtotime($clock_expired_time,'UTC') - time();
+    $time_left = api_strtotime($clock_expired_time, 'UTC') - time();
 
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
@@ -70,7 +70,7 @@ 
 
 $html = '';
 $message = '';
-$html.= '<div class="exercise">';
+$html .= '<div class="exercise">';
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 $edit_link = '';
 if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
@@ -116,7 +116,7 @@ 
 
 // 2. Exercise button
 // Notice we not add there the lp_item_view_id because is not already generated
-$exercise_url = api_get_path(WEB_CODE_PATH) . 'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.$extra_params;
+$exercise_url = api_get_path(WEB_CODE_PATH).'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.$extra_params;
 $exercise_url_button = Display::url(
     $label,
     $exercise_url,
@@ -182,8 +182,8 @@ 
             $attempt_result['exe_result'],
             $attempt_result['exe_weighting']
         );
-        $attempt_url = api_get_path(WEB_CODE_PATH) . 'exercise/result.php?';
-        $attempt_url .= api_get_cidreq() . '&show_headers=1&';
+        $attempt_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?';
+        $attempt_url .= api_get_cidreq().'&show_headers=1&';
         $attempt_url .= http_build_query([
             'id' => $attempt_result['exe_id']
         ]);
@@ -193,7 +193,7 @@ 
             get_lang('Show'),
             $attempt_url,
             [
-                'class' => $btn_class . 'btn btn-default',
+                'class' => $btn_class.'btn btn-default',
                 'data-title' => get_lang('Show'),
                 'data-size' => 'lg'
             ]
@@ -211,7 +211,7 @@ 
             ),
             'userIp' => $attempt_result['user_ip']
         );
-        $attempt_link .= "&nbsp;&nbsp;&nbsp;" . $teacher_revised;
+        $attempt_link .= "&nbsp;&nbsp;&nbsp;".$teacher_revised;
 
         if (in_array(
             $objExercise->results_disabled,
@@ -307,7 +307,7 @@ 
 }
 
 if ($time_control) {
-    $html.= $objExercise->return_time_left_div();
+    $html .= $objExercise->return_time_left_div();
 }
 
 $html .= $message;
@@ -327,7 +327,7 @@ 
     $table_content,
     ['class' => 'table-responsive']
 );
-$html.= '</div>';
+$html .= '</div>';
 echo $html;
 
 Display::display_footer();

main/exercise/matching.class.php

Spacing +12 added lines, -12 removed lines

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

main/exercise/exercise_reminder.php

Indentation +3 added lines, -3 removed lines

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

Spacing +3 added lines, -3 removed lines

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

main/exercise/answer.class.php

Spacing +15 added lines, -15 removed lines

@@ -73,7 +73,7 @@ 
         $objExercise->read($exerciseId);
 
         if ($objExercise->random_answers == '1') {
-            $this->readOrderedBy('rand()', '');// randomize answers
+            $this->readOrderedBy('rand()', ''); // randomize answers
         } else {
             $this->read(); // natural order
         }
@@ -114,7 +114,7 @@ 
                 ORDER BY position";
 
         $result = Database::query($sql);
-        $i=1;
+        $i = 1;
 
         // while a record is found
         while ($object = Database::fetch_object($result)) {
@@ -130,7 +130,7 @@ 
             $this->autoId[$i] = $object->id_auto;
             $i++;
         }
-        $this->nbrAnswers = $i-1;
+        $this->nbrAnswers = $i - 1;
     }
 
     /**
@@ -142,7 +142,7 @@ 
     {
         foreach ($this->autoId as $key => $autoId) {
             if ($autoId == $id) {
-                $result =  [
+                $result = [
                     'answer' => $this->answer[$key],
                     'correct' => $this->correct[$key],
                     'comment' => $this->comment[$key],
@@ -166,7 +166,7 @@ 
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
         $questionId = $this->questionId;
 
-        $sql="SELECT id FROM
+        $sql = "SELECT id FROM
               $TBL_ANSWER
               WHERE c_id = {$this->course_id} AND question_id ='".$questionId."'";
 
@@ -188,14 +188,14 @@ 
      * @param	string	DESC or ASC
      * @author 	Frederic Vauthier
      */
-    public function readOrderedBy($field, $order='ASC')
+    public function readOrderedBy($field, $order = 'ASC')
     {
 		$field = Database::escape_string($field);
 		if (empty($field)) {
 			$field = 'position';
 		}
 
-		if ($order != 'ASC' && $order!='DESC') {
+		if ($order != 'ASC' && $order != 'DESC') {
 			$order = 'ASC';
 		}
 
@@ -230,7 +230,7 @@ 
                     c_id = {$this->course_id} AND
                     question_id='".$questionId."'
                 ORDER BY $field $order";
-		$result=Database::query($sql);
+		$result = Database::query($sql);
 
 		$i = 1;
 		// while a record is found
@@ -260,7 +260,7 @@ 
             $this->autoId[$i] = $doubt_data->id_auto;
             $i++;
 	    }
-        $this->nbrAnswers = $i-1;
+        $this->nbrAnswers = $i - 1;
 	}
 
 	/**
@@ -402,8 +402,8 @@ 
     public function getGradesList()
      {
 	 	$list = array();
-	 	for ($i = 0; $i<$this->nbrAnswers;$i++){
-	 		if(!empty($this->answer[$i])){
+	 	for ($i = 0; $i < $this->nbrAnswers; $i++) {
+	 		if (!empty($this->answer[$i])) {
 	 			$list[$i] = $this->weighting[$i];
 	 		}
 	 	}
@@ -421,7 +421,7 @@ 
 	 	$sql = "SELECT type FROM $TBL_QUESTIONS
 	 	        WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
 	 	$res = Database::query($sql);
-	 	if (Database::num_rows($res)<=0){
+	 	if (Database::num_rows($res) <= 0) {
 	 		return null;
 	 	}
 	 	$row = Database::fetch_array($res);
@@ -593,7 +593,7 @@ 
         $correctList = [];
         $answerList = [];
 
-		for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+		for ($i = 1; $i <= $this->new_nbrAnswers; $i++) {
 			$answer = $this->new_answer[$i];
 			$correct = $this->new_correct[$i];
 			$comment = $this->new_comment[$i];
@@ -748,7 +748,7 @@ 
             $destination_options = Question::readQuestionOption($newQuestionId, $course_info['real_id']);
             $i = 0;
             if (!empty($destination_options)) {
-                foreach($destination_options as $item) {
+                foreach ($destination_options as $item) {
                     $fixed_list[$new_option_list[$i]] = $item['id'];
                     $i++;
                 }
@@ -760,7 +760,7 @@ 
 			// inserts new answers into data base
 			$c_id = $course_info['real_id'];
 
-			for ($i=1;$i <= $this->nbrAnswers;$i++) {
+			for ($i = 1; $i <= $this->nbrAnswers; $i++) {
                 if ($this->course['id'] != $course_info['id']) {
                     $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $this->answer[$i],

Indentation +319 added lines, -319 removed lines

@@ -37,8 +37,8 @@ 
     public $new_destination; // id of the next question if feedback option is set to Directfeedback
     public $course; //Course information
     public $iid;
-	public $questionJSId;
-	public $standalone;
+    public $questionJSId;
+    public $standalone;
 
     /**
      * constructor of the class
@@ -159,12 +159,12 @@ 
         return [];
     }
 
-     /**
-     * returns all answer ids from this question Id
-     *
-     * @author Yoselyn Castillo
-     * @return array - $id (answer ids)
-     */
+        /**
+         * returns all answer ids from this question Id
+         *
+         * @author Yoselyn Castillo
+         * @return array - $id (answer ids)
+         */
     public function selectAnswerId()
     {
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
@@ -184,7 +184,7 @@ 
         }
 
         return $id;
-	}
+    }
 
     /**
      * Reads answer information from the data base ordered by parameter
@@ -195,23 +195,23 @@ 
      */
     public function readOrderedBy($field, $order='ASC')
     {
-		$field = Database::escape_string($field);
-		if (empty($field)) {
-			$field = 'position';
-		}
+        $field = Database::escape_string($field);
+        if (empty($field)) {
+            $field = 'position';
+        }
 
-		if ($order != 'ASC' && $order!='DESC') {
-			$order = 'ASC';
-		}
+        if ($order != 'ASC' && $order!='DESC') {
+            $order = 'ASC';
+        }
 
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
-		$questionId = intval($this->questionId);
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $questionId = intval($this->questionId);
 
-		$sql = "SELECT type FROM $TBL_QUIZ
+        $sql = "SELECT type FROM $TBL_QUIZ
 		        WHERE c_id = {$this->course_id} AND id = $questionId";
-		$result_question = Database::query($sql);
-		$questionType = Database::fetch_array($result_question);
+        $result_question = Database::query($sql);
+        $questionType = Database::fetch_array($result_question);
 
         if ($questionType['type'] == DRAGGABLE) {
             // Random is done by submit.js.tpl
@@ -220,7 +220,7 @@ 
             return true;
         }
 
-		$sql = "SELECT
+        $sql = "SELECT
 		            answer,
 		            correct,
 		            comment,
@@ -236,16 +236,16 @@ 
                     c_id = {$this->course_id} AND
                     question_id='".$questionId."'
                 ORDER BY $field $order";
-		$result=Database::query($sql);
-
-		$i = 1;
-		// while a record is found
-		$doubt_data = null;
-		while ($object = Database::fetch_object($result)) {
-		    if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
-		        $doubt_data = $object;
+        $result=Database::query($sql);
+
+        $i = 1;
+        // while a record is found
+        $doubt_data = null;
+        while ($object = Database::fetch_object($result)) {
+            if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
+                $doubt_data = $object;
                 continue;
-		    }
+            }
             $this->answer[$i] = $object->answer;
             $this->correct[$i] = $object->correct;
             $this->comment[$i] = $object->comment;
@@ -257,9 +257,9 @@ 
             $this->autoId[$i] = $object->id_auto;
             $this->iid[$i] = $object->iid;
             $i++;
-		}
+        }
 
-		if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
+        if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
             $this->answer[$i] = $doubt_data->answer;
             $this->correct[$i] = $doubt_data->correct;
             $this->comment[$i] = $doubt_data->comment;
@@ -271,88 +271,88 @@ 
             $this->autoId[$i] = $doubt_data->id_auto;
             $this->iid[$i] = $doubt_data->iid;
             $i++;
-	    }
+        }
         $this->nbrAnswers = $i-1;
-	}
-
-	/**
-	 * returns the autoincrement id identificator
-	 *
-	 * @author Juan Carlos Ra�a
-	 * @return integer - answer num
-	 */
+    }
+
+    /**
+     * returns the autoincrement id identificator
+     *
+     * @author Juan Carlos Ra�a
+     * @return integer - answer num
+     */
     public function selectAutoId($id)
     {
-		return isset($this->autoId[$id]) ? $this->autoId[$id] : 0;
-	}
-
-	/**
-	 * returns the number of answers in this question
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - number of answers
-	 */
-	public function selectNbrAnswers()
+        return isset($this->autoId[$id]) ? $this->autoId[$id] : 0;
+    }
+
+    /**
+     * returns the number of answers in this question
+     *
+     * @author Olivier Brouckaert
+     * @return integer - number of answers
+     */
+    public function selectNbrAnswers()
     {
-		return $this->nbrAnswers;
-	}
-
-	/**
-	 * returns the question ID which the answers belong to
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - the question ID
-	 */
-	public function selectQuestionId()
+        return $this->nbrAnswers;
+    }
+
+    /**
+     * returns the question ID which the answers belong to
+     *
+     * @author Olivier Brouckaert
+     * @return integer - the question ID
+     */
+    public function selectQuestionId()
     {
-		return $this->questionId;
-	}
-
-	/**
-	 * returns the question ID of the destination question
-	 *
-	 * @author Julio Montoya
-	 * @param integer $id
-	 * @return integer - the question ID
-	 */
-	public function selectDestination($id)
+        return $this->questionId;
+    }
+
+    /**
+     * returns the question ID of the destination question
+     *
+     * @author Julio Montoya
+     * @param integer $id
+     * @return integer - the question ID
+     */
+    public function selectDestination($id)
     {
-		return isset($this->destination[$id]) ? $this->destination[$id] : null;
-	}
+        return isset($this->destination[$id]) ? $this->destination[$id] : null;
+    }
 
     /**
-	 * returns the answer title
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer title
-	 */
-	public function selectAnswer($id)
-	{
-		return isset($this->answer[$id]) ? $this->answer[$id] : null;
-	}
-
-	/**
-	 * return array answer by id else return a bool
-	 * @param integer $auto_id
-	 */
-	public function selectAnswerByAutoId($auto_id)
-	{
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-
-		$auto_id = intval($auto_id);
-		$sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
+     * returns the answer title
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer title
+     */
+    public function selectAnswer($id)
+    {
+        return isset($this->answer[$id]) ? $this->answer[$id] : null;
+    }
+
+    /**
+     * return array answer by id else return a bool
+     * @param integer $auto_id
+     */
+    public function selectAnswerByAutoId($auto_id)
+    {
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+
+        $auto_id = intval($auto_id);
+        $sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
 				WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs, 'ASSOC');
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs, 'ASSOC');
 
-			return $row;
-		}
+            return $row;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * returns the answer title from an answer's position
@@ -361,18 +361,18 @@ 
      * @param - integer $id - answer ID
      * @return bool - answer title
      */
-	public function selectAnswerIdByPosition($pos)
-	{
-		foreach ($this->position as $k => $v) {
-			if ($v != $pos) {
-				continue;
-			}
+    public function selectAnswerIdByPosition($pos)
+    {
+        foreach ($this->position as $k => $v) {
+            if ($v != $pos) {
+                continue;
+            }
 
-			return $k;
-		}
+            return $k;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns a list of answers
@@ -381,18 +381,18 @@ 
      * of (id, answer, comment, grade) and grade=weighting
      */
     public function getAnswersList($decode = false)
-     {
-	 	$list = array();
-         for ($i = 1; $i <= $this->nbrAnswers; $i++) {
-             if (!empty($this->answer[$i])) {
-
-	 			//Avoid problems when parsing elements with accents
-	 			if ($decode) {
-	        		$this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
-	        		$this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
-	 			}
-
-	 			$list[] = array(
+        {
+            $list = array();
+            for ($i = 1; $i <= $this->nbrAnswers; $i++) {
+                if (!empty($this->answer[$i])) {
+
+                    //Avoid problems when parsing elements with accents
+                    if ($decode) {
+                    $this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
+                    $this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
+                    }
+
+                    $list[] = array(
                     'id' => $i,
                     'answer' => $this->answer[$i],
                     'comment' => $this->comment[$i],
@@ -401,137 +401,137 @@ 
                     'hotspot_type' => $this->hotspot_type[$i],
                     'correct' => $this->correct[$i],
                     'destination' => $this->destination[$i]
-				);
+                );
+            }
             }
-	 	}
 
-	 	return $list;
-	 }
+            return $list;
+        }
 
-	/**
-	 * Returns a list of grades
-	 * @author Yannick Warnier <ywarnier@beeznest.org>
-	 * @return array	List of grades where grade=weighting (?)
-	 */
+    /**
+     * Returns a list of grades
+     * @author Yannick Warnier <ywarnier@beeznest.org>
+     * @return array	List of grades where grade=weighting (?)
+     */
     public function getGradesList()
-     {
-	 	$list = array();
-	 	for ($i = 0; $i<$this->nbrAnswers;$i++){
-	 		if(!empty($this->answer[$i])){
-	 			$list[$i] = $this->weighting[$i];
-	 		}
-	 	}
-	 	return $list;
-	 }
-
-	 /**
-	  * Returns the question type
-	  * @author	Yannick Warnier <ywarnier@beeznest.org>
-	  * @return	integer	The type of the question this answer is bound to
-	  */
+        {
+            $list = array();
+            for ($i = 0; $i<$this->nbrAnswers;$i++){
+                if(!empty($this->answer[$i])){
+                    $list[$i] = $this->weighting[$i];
+                }
+            }
+            return $list;
+        }
+
+        /**
+         * Returns the question type
+         * @author	Yannick Warnier <ywarnier@beeznest.org>
+         * @return	integer	The type of the question this answer is bound to
+         */
     public function getQuestionType()
-     {
-	 	$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-	 	$sql = "SELECT type FROM $TBL_QUESTIONS
+        {
+            $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $sql = "SELECT type FROM $TBL_QUESTIONS
 	 	        WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
-	 	$res = Database::query($sql);
-	 	if (Database::num_rows($res)<=0){
-	 		return null;
-	 	}
-	 	$row = Database::fetch_array($res);
-
-	 	return $row['type'];
-	 }
-
-
-	/**
-	 * tells if answer is correct or not
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - 0 if bad answer, not 0 if good answer
-	 */
+            $res = Database::query($sql);
+            if (Database::num_rows($res)<=0){
+                return null;
+            }
+            $row = Database::fetch_array($res);
+
+            return $row['type'];
+        }
+
+
+    /**
+     * tells if answer is correct or not
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - 0 if bad answer, not 0 if good answer
+     */
     public function isCorrect($id)
-	{
-		return isset($this->correct[$id]) ? $this->correct[$id] : null;
-	}
-
-	/**
-	 * returns answer comment
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer comment
-	 */
+    {
+        return isset($this->correct[$id]) ? $this->correct[$id] : null;
+    }
+
+    /**
+     * returns answer comment
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer comment
+     */
     public function selectComment($id)
-	{
+    {
         return isset($this->comment[$id]) ? $this->comment[$id] : null;
-	}
-
-	/**
-	 * returns answer weighting
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @param integer $id
-	 * @return integer - answer weighting
-	 */
+    }
+
+    /**
+     * returns answer weighting
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @param integer $id
+     * @return integer - answer weighting
+     */
     public function selectWeighting($id)
-	{
-		return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
-	}
-
-	/**
-	 * returns answer position
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - answer position
-	 */
-	function selectPosition($id)
-	{
-		return isset($this->position[$id]) ? $this->position[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot coordinates
-	 *
-	 * @author	Olivier Brouckaert
-	 * @param	integer	Answer ID
-	 * @param integer $id
-	 * @return	integer	Answer position
-	 */
+    {
+        return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
+    }
+
+    /**
+     * returns answer position
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - answer position
+     */
+    function selectPosition($id)
+    {
+        return isset($this->position[$id]) ? $this->position[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot coordinates
+     *
+     * @author	Olivier Brouckaert
+     * @param	integer	Answer ID
+     * @param integer $id
+     * @return	integer	Answer position
+     */
     public function selectHotspotCoordinates($id)
-	{
-		return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot type
-	 *
-	 * @author	Toon Keppens
-	 * @param	integer		Answer ID
-	 * @param integer $id
-	 * @return	integer		Answer position
-	 */
+    {
+        return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot type
+     *
+     * @author	Toon Keppens
+     * @param	integer		Answer ID
+     * @param integer $id
+     * @return	integer		Answer position
+     */
     public function selectHotspotType($id)
-	{
-		return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
-	}
-
-	/**
-	 * Creates a new answer
-	 *
-	 * @author Olivier Brouckaert
-	 * @param string 	$answer answer title
-	 * @param integer 	$correct 0 if bad answer, not 0 if good answer
-	 * @param string 	$comment answer comment
-	 * @param integer 	$weighting answer weighting
-	 * @param integer 	$position answer position
-	 * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
-	 * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
+    {
+        return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
+    }
+
+    /**
+     * Creates a new answer
+     *
+     * @author Olivier Brouckaert
+     * @param string 	$answer answer title
+     * @param integer 	$correct 0 if bad answer, not 0 if good answer
+     * @param string 	$comment answer comment
+     * @param integer 	$weighting answer weighting
+     * @param integer 	$position answer position
+     * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
+     * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
      * @param string   $destination
-	 */
+     */
     public function createAnswer(
         $answer,
         $correct,
@@ -542,7 +542,7 @@ 
         $new_hotspot_type = null,
         $destination = ''
     ) {
-		$this->new_nbrAnswers++;
+        $this->new_nbrAnswers++;
         $id = $this->new_nbrAnswers;
         $this->new_answer[$id] = $answer;
         $this->new_correct[$id] = $correct;
@@ -552,7 +552,7 @@ 
         $this->new_hotspot_coordinates[$id] = $new_hotspot_coordinates;
         $this->new_hotspot_type[$id] = $new_hotspot_type;
         $this->new_destination[$id] = $destination;
-	}
+    }
 
     /**
      * Updates an answer
@@ -595,32 +595,32 @@ 
 
         $em->merge($quizAnswer);
         $em->flush();
-	}
+    }
 
-	/**
-	 * Records answers into the data base
-	 *
-	 * @author Olivier Brouckaert
-	 */
+    /**
+     * Records answers into the data base
+     *
+     * @author Olivier Brouckaert
+     */
     public function save()
     {
-		$answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
         $em = Database::getManager();
-		$questionId = intval($this->questionId);
+        $questionId = intval($this->questionId);
 
-		$c_id = $this->course['real_id'];
+        $c_id = $this->course['real_id'];
         $correctList = [];
         $answerList = [];
 
-		for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
-			$answer = $this->new_answer[$i];
-			$correct = isset($this->new_correct[$i]) ? $this->new_correct[$i] : '';
-			$comment = isset($this->new_comment[$i]) ? $this->new_comment[$i] : '';
-			$weighting = isset($this->new_weighting[$i]) ? $this->new_weighting[$i] : '';
-			$position = isset($this->new_position[$i]) ? $this->new_position[$i] : '';
-			$hotspot_coordinates = isset($this->new_hotspot_coordinates[$i]) ? $this->new_hotspot_coordinates[$i] : '';
-			$hotspot_type = isset($this->new_hotspot_type[$i]) ? $this->new_hotspot_type[$i] : '';
-			$destination = isset($this->new_destination[$i]) ? $this->new_destination[$i] : '';
+        for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+            $answer = $this->new_answer[$i];
+            $correct = isset($this->new_correct[$i]) ? $this->new_correct[$i] : '';
+            $comment = isset($this->new_comment[$i]) ? $this->new_comment[$i] : '';
+            $weighting = isset($this->new_weighting[$i]) ? $this->new_weighting[$i] : '';
+            $position = isset($this->new_position[$i]) ? $this->new_position[$i] : '';
+            $hotspot_coordinates = isset($this->new_hotspot_coordinates[$i]) ? $this->new_hotspot_coordinates[$i] : '';
+            $hotspot_type = isset($this->new_hotspot_type[$i]) ? $this->new_hotspot_type[$i] : '';
+            $destination = isset($this->new_destination[$i]) ? $this->new_destination[$i] : '';
             $autoId = $this->selectAutoId($i);
             $iid = isset($this->iid[$i]) ? $this->iid[$i] : 0;
 
@@ -663,11 +663,11 @@ 
 
                         $correctAnswerId = $answer->selectAnswerIdByPosition($correct);
 
-						// Continue to avoid matching question bug if $correctAnswerId returns false
-						// See : https://support.chamilo.org/issues/8334
-						if ($questionType == MATCHING && !$correctAnswerId) {
-							continue;
-						}
+                        // Continue to avoid matching question bug if $correctAnswerId returns false
+                        // See : https://support.chamilo.org/issues/8334
+                        if ($questionType == MATCHING && !$correctAnswerId) {
+                            continue;
+                        }
 
                         $correctAnswerAutoId = $answer->selectAutoId($correct);
 
@@ -734,28 +734,28 @@ 
             }
         }
 
-		// moves $new_* arrays
-		$this->answer = $this->new_answer;
-		$this->correct = $this->new_correct;
-		$this->comment = $this->new_comment;
-		$this->weighting = $this->new_weighting;
-		$this->position = $this->new_position;
-		$this->hotspot_coordinates = $this->new_hotspot_coordinates;
-		$this->hotspot_type = $this->new_hotspot_type;
-		$this->nbrAnswers = $this->new_nbrAnswers;
-		$this->destination = $this->new_destination;
-
-		$this->cancel();
-	}
-
-	/**
-	 * Duplicates answers by copying them into another question
-	 *
-	 * @author Olivier Brouckaert
-	 * @param  int question id
+        // moves $new_* arrays
+        $this->answer = $this->new_answer;
+        $this->correct = $this->new_correct;
+        $this->comment = $this->new_comment;
+        $this->weighting = $this->new_weighting;
+        $this->position = $this->new_position;
+        $this->hotspot_coordinates = $this->new_hotspot_coordinates;
+        $this->hotspot_type = $this->new_hotspot_type;
+        $this->nbrAnswers = $this->new_nbrAnswers;
+        $this->destination = $this->new_destination;
+
+        $this->cancel();
+    }
+
+    /**
+     * Duplicates answers by copying them into another question
+     *
+     * @author Olivier Brouckaert
+     * @param  int question id
      * @param  array destination course info (result of the function api_get_course_info() )
      * @param string $newQuestionId
-	 */
+     */
     public function duplicate($newQuestionId, $course_info = null)
     {
         if (empty($course_info)) {
@@ -775,7 +775,7 @@ 
 
             if (!empty($origin_options)) {
                 foreach ($origin_options as $item) {
-            	   $new_option_list[] = $item['id'];
+                    $new_option_list[] = $item['id'];
                 }
             }
 
@@ -789,12 +789,12 @@ 
             }
         }
 
-		// if at least one answer
-		if ($this->nbrAnswers) {
-			// inserts new answers into data base
-			$c_id = $course_info['real_id'];
+        // if at least one answer
+        if ($this->nbrAnswers) {
+            // inserts new answers into data base
+            $c_id = $course_info['real_id'];
 
-			for ($i=1;$i <= $this->nbrAnswers;$i++) {
+            for ($i=1;$i <= $this->nbrAnswers;$i++) {
                 if ($this->course['id'] != $course_info['id']) {
                     $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $this->answer[$i],
@@ -808,7 +808,7 @@ 
                     );
                 }
 
-				$correct = $this->correct[$i];
+                $correct = $this->correct[$i];
 
                 if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
                     self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE
@@ -840,9 +840,9 @@ 
 
                 $em->merge($quizAnswer);
                 $em->flush();
-			}
+            }
         }
-	}
+    }
 
     /**
      * Get the necessary JavaScript for some answers
@@ -860,25 +860,25 @@ 
             </script>";
     }
 
-	/**
-	 * Check if a answer is correct by an answer auto id
-	 * @param $needle int The answer auto id
-	 * @return bool
-	 */
-	public function isCorrectByAutoId($needle)
-	{
-		$key = 0;
-
-		foreach ($this->autoId as $autoIdKey => $autoId) {
-			if ($autoId == $needle) {
-				$key = $autoIdKey;
-			}
-		}
-
-		if (!$key) {
-			return false;
-		}
-
-		return $this->isCorrect($key) ? true : false;
-	}
+    /**
+     * Check if a answer is correct by an answer auto id
+     * @param $needle int The answer auto id
+     * @return bool
+     */
+    public function isCorrectByAutoId($needle)
+    {
+        $key = 0;
+
+        foreach ($this->autoId as $autoIdKey => $autoId) {
+            if ($autoId == $needle) {
+                $key = $autoIdKey;
+            }
+        }
+
+        if (!$key) {
+            return false;
+        }
+
+        return $this->isCorrect($key) ? true : false;
+    }
 }