chamilo / chamilo-lms

main/inc/lib/pear/HTML/Table.php

Indentation +58 added lines, -59 removed lines

@@ -1,63 +1,62 @@ 
 <?php
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
- * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and
- * efficient.
- *
- * The PEAR::HTML_Table package provides methods for easy and efficient design
- * of HTML tables.
- * - Lots of customization options.
- * - Tables can be modified at any time.
- * - The logic is the same as standard HTML editors.
- * - Handles col and rowspans.
- * - PHP code is shorter, easier to read and to maintain.
- * - Tables options can be reused.
- *
- * For auto filling of data and such then check out
- * http://pear.php.net/package/HTML_Table_Matrix
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2005-2007, Adam Daniel <adaniel1@eesus.jnj.com>,
- *                          Bertrand Mansion <bmansion@mamasam.com>,
- *                          Mark Wiesemann <wiesemann@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- *
- * @category   HTML
- * @package    HTML_Table
- * @author     Adam Daniel <adaniel1@eesus.jnj.com>
- * @author     Bertrand Mansion <bmansion@mamasam.com>
- * @license    http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Table.php,v 1.39 2007/06/25 16:44:43 wiesemann Exp $
- * @link       http://pear.php.net/package/HTML_Table
- */
+     * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and
+     * efficient.
+     *
+     * The PEAR::HTML_Table package provides methods for easy and efficient design
+     * of HTML tables.
+     * - Lots of customization options.
+     * - Tables can be modified at any time.
+     * - The logic is the same as standard HTML editors.
+     * - Handles col and rowspans.
+     * - PHP code is shorter, easier to read and to maintain.
+     * - Tables options can be reused.
+     *
+     * For auto filling of data and such then check out
+     * http://pear.php.net/package/HTML_Table_Matrix
+     *
+     * PHP versions 4 and 5
+     *
+     * LICENSE:
+     *
+     * Copyright (c) 2005-2007, Adam Daniel <adaniel1@eesus.jnj.com>,
+     *                          Bertrand Mansion <bmansion@mamasam.com>,
+     *                          Mark Wiesemann <wiesemann@php.net>
+     * All rights reserved.
+     *
+     * Redistribution and use in source and binary forms, with or without
+     * modification, are permitted provided that the following conditions
+     * are met:
+     *
+     *    * Redistributions of source code must retain the above copyright
+     *      notice, this list of conditions and the following disclaimer.
+     *    * Redistributions in binary form must reproduce the above copyright
+     *      notice, this list of conditions and the following disclaimer in the
+     *      documentation and/or other materials provided with the distribution.
+     *    * The names of the authors may not be used to endorse or promote products
+     *      derived from this software without specific prior written permission.
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+     * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+     * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+     * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+     * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+     * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+     * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+     * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+     * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     *
+     * @category   HTML
+     * @package    HTML_Table
+     * @author     Adam Daniel <adaniel1@eesus.jnj.com>
+     * @author     Bertrand Mansion <bmansion@mamasam.com>
+     * @license    http://www.opensource.org/licenses/bsd-license.php New BSD License
+     * @version    CVS: $Id: Table.php,v 1.39 2007/06/25 16:44:43 wiesemann Exp $
+     * @link       http://pear.php.net/package/HTML_Table
+     */
 
 /**
  * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and efficient.
@@ -256,7 +255,7 @@ 
 
         $body = $this->_tbodyCount++;
         $this->_tbodies[$body] = new HTML_Table_Storage($this->_tabOffset,
-                                                         $this->_useTGroups);
+                                                            $this->_useTGroups);
         $this->_tbodies[$body]->setAutoFill($this->_autoFill);
         $this->_tbodies[$body]->setAttributes($attributes);
         return $body;
@@ -308,7 +307,7 @@ 
         if (isset($colgroup)) {
             $attributes = $this->_parseAttributes($attributes);
             $this->_colgroup[] = array('attr' => $attributes,
-                                       'contents' => $colgroup);
+                                        'contents' => $colgroup);
         } else {
             $this->_colgroup = array();
         }

main/exercice/exercise.class.php

Doc Comments +13 added lines, -8 removed lines

@@ -354,7 +354,7 @@ 
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function selectPassPercentage()
     {
@@ -473,7 +473,7 @@ 
      * tells if questions are selected randomly, and if so returns the draws
      *
      * @author Olivier Brouckaert
-     * @return integer - 0 if not random, otherwise the draws
+     * @return boolean - 0 if not random, otherwise the draws
      */
     public function isRandom()
     {
@@ -2830,7 +2830,7 @@ 
      * @param int  int lp id
      * @param int  int lp item id
      * @param int  int lp item_view id
-     * @param float $weight
+     * @param integer $weight
      * @param array question list
      */
     public function save_stat_track_exercise_info(
@@ -5118,6 +5118,7 @@ 
     /**
      * Sends a notification when a user ends an examn
      *
+     * @param integer $exe_id
      */
     public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id)
     {
@@ -5198,6 +5199,7 @@ 
     /**
      * Sends a notification when a user ends an examn
      *
+     * @param integer $exe_id
      */
     function send_notification_for_open_questions($question_list_answers, $origin, $exe_id)
     {
@@ -5295,6 +5297,9 @@ 
         }
     }
 
+    /**
+     * @param integer $exe_id
+     */
     function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id)
     {
         if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
@@ -5388,7 +5393,7 @@ 
 
     /**
      * @param array $user_data result of api_get_user_info()
-     * @param null $start_date
+     * @param string $start_date
      * @param null $duration
      * @param string $ip Optional. The user IP
      * @return string
@@ -5446,7 +5451,7 @@ 
      * @param int     Maximum number of attempts (0 if no limit)
      * @param int     Feedback type
      * @todo this was function was added due the import exercise via CSV
-     * @return    int New exercise ID
+     * @return    string New exercise ID
      */
     public function createExercise(
         $title,
@@ -6795,7 +6800,7 @@ 
      * @param bool $show_comment
      * @param null $exercise_feedback
      * @param bool $show_answers
-     * @param null $modelType
+     * @param integer $modelType
      * @param bool $categoryMinusOne
      * @return bool|null|string
      */
@@ -7956,8 +7961,8 @@ 
     /**
      * Returns an HTML ribbon to show on top of the exercise result, with
      * colouring depending on the success or failure of the student
-     * @param $score
-     * @param $weight
+     * @param integer $score
+     * @param integer $weight
      * @param bool $check_pass_percentage
      * @return string
      */

Spacing +349 added lines, -349 removed lines

@@ -27,7 +27,7 @@ 
     public $feedback_type;
     public $end_time;
     public $start_time;
-    public $questionList;  // array with the list of this exercise's questions
+    public $questionList; // array with the list of this exercise's questions
     /* including question list of the media */
     public $questionListUncompressed;
     public $results_disabled;
@@ -130,7 +130,7 @@ 
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $table_lp_item = Database::get_course_table(TABLE_LP_ITEM);
 
-        $id  = intval($id);
+        $id = intval($id);
         if (empty($this->course_id)) {
             return false;
         }
@@ -189,10 +189,10 @@ 
             }
 
             if ($object->end_time != '0000-00-00 00:00:00') {
-                $this->end_time 	= $object->end_time;
+                $this->end_time = $object->end_time;
             }
             if ($object->start_time != '0000-00-00 00:00:00') {
-                $this->start_time 	= $object->start_time;
+                $this->start_time = $object->start_time;
             }
 
             //control time
@@ -477,7 +477,7 @@ 
      */
     public function isRandom()
     {
-        if($this->random > 0 || $this->random == -1) {
+        if ($this->random > 0 || $this->random == -1) {
             return true;
         } else {
             return false;
@@ -638,7 +638,7 @@ 
                     $question_media = null;
                     if (!empty($objQuestionTmp->parent_id)) {
                         $objQuestionMedia = Question::read($objQuestionTmp->parent_id);
-                        $question_media  = Question::getMediaLabel($objQuestionMedia->question);
+                        $question_media = Question::getMediaLabel($objQuestionMedia->question);
                     }
 
                     $questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), ICON_SIZE_MEDIUM).$question_media);
@@ -1031,7 +1031,7 @@ 
 
             foreach ($questions_by_category as $categoryId => $questionList) {
                 $cat = new TestCategory($categoryId);
-                $cat = (array)$cat;
+                $cat = (array) $cat;
                 $cat['iid'] = $cat['id'];
                 //*$cat['name'] = $cat['name'];
 
@@ -1096,7 +1096,7 @@ 
     {
         if ($this->specialCategoryOrders == false) {
             if ($from_db && !empty($this->id)) {
-                $TBL_EXERCISE_QUESTION  = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
+                $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
                 $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
 
                 $sql = "SELECT DISTINCT e.question_order
@@ -1123,7 +1123,7 @@ 
                 $question_list = array();
 
                 while ($new_object = Database::fetch_object($result)) {
-                    $question_list[$new_object->question_order]=  $new_object->question_id;
+                    $question_list[$new_object->question_order] = $new_object->question_id;
                     $temp_question_list[$counter] = $new_object->question_id;
                     $counter++;
                 }
@@ -1267,7 +1267,7 @@ 
     public function isInList($questionId)
     {
         if (is_array($this->questionList))
-            return in_array($questionId,$this->questionList);
+            return in_array($questionId, $this->questionList);
         else
             return false;
     }
@@ -1280,7 +1280,7 @@ 
      */
     public function updateTitle($title)
     {
-        $this->exercise=$title;
+        $this->exercise = $title;
     }
 
     /**
@@ -1290,7 +1290,7 @@ 
      */
     public function updateAttempts($attempts)
     {
-        $this->attempts=$attempts;
+        $this->attempts = $attempts;
     }
 
     /**
@@ -1300,7 +1300,7 @@ 
      */
     public function updateFeedbackType($feedback_type)
     {
-        $this->feedback_type=$feedback_type;
+        $this->feedback_type = $feedback_type;
     }
 
     /**
@@ -1311,7 +1311,7 @@ 
      */
     public function updateDescription($description)
     {
-        $this->description=$description;
+        $this->description = $description;
     }
 
     /**
@@ -1441,23 +1441,23 @@ 
      * @param string $sound - exercise sound file
      * @param string $delete - ask to delete the file
      */
-    public function updateSound($sound,$delete)
+    public function updateSound($sound, $delete)
     {
         global $audioPath, $documentPath;
         $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
 
-        if ($sound['size'] && (strstr($sound['type'],'audio') || strstr($sound['type'],'video'))) {
-            $this->sound=$sound['name'];
+        if ($sound['size'] && (strstr($sound['type'], 'audio') || strstr($sound['type'], 'video'))) {
+            $this->sound = $sound['name'];
 
-            if (@move_uploaded_file($sound['tmp_name'],$audioPath.'/'.$this->sound)) {
+            if (@move_uploaded_file($sound['tmp_name'], $audioPath.'/'.$this->sound)) {
                 $query = "SELECT 1 FROM $TBL_DOCUMENT
-                        WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'";
-                $result=Database::query($query);
+                        WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath, '', $audioPath).'/'.$this->sound."'";
+                $result = Database::query($query);
 
                 if (!Database::num_rows($result)) {
                     $id = add_document(
                         $this->course,
-                        str_replace($documentPath,'',$audioPath).'/'.$this->sound,
+                        str_replace($documentPath, '', $audioPath).'/'.$this->sound,
                         'file',
                         $sound['size'],
                         $sound['name']
@@ -1476,8 +1476,8 @@ 
                     );
                 }
             }
-        } elseif($delete && is_file($audioPath.'/'.$this->sound)) {
-            $this->sound='';
+        } elseif ($delete && is_file($audioPath.'/'.$this->sound)) {
+            $this->sound = '';
         }
     }
 
@@ -1489,7 +1489,7 @@ 
      */
     public function updateType($type)
     {
-        $this->type=$type;
+        $this->type = $type;
     }
 
     /**
@@ -1525,7 +1525,7 @@ 
      */
     public function enable()
     {
-        $this->active=1;
+        $this->active = 1;
     }
 
     /**
@@ -1535,7 +1535,7 @@ 
      */
     public function disable()
     {
-        $this->active=0;
+        $this->active = 0;
     }
 
     /**
@@ -1663,7 +1663,7 @@ 
                 api_get_user_id()
             );
 
-            if (api_get_setting('search_enabled')=='true') {
+            if (api_get_setting('search_enabled') == 'true') {
                 $this->search_engine_edit();
             }
         } else {
@@ -1811,7 +1811,7 @@ 
     public function removeFromList($questionId)
     {
         // searches the position of the question ID in the list
-        $pos = array_search($questionId,$this->questionList);
+        $pos = array_search($questionId, $this->questionList);
 
         // question not found
         if ($pos === false) {
@@ -1846,7 +1846,7 @@ 
         api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizDeleted', api_get_user_id());
         api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'delete', api_get_user_id());
 
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian') ) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $this->search_engine_delete();
         }
     }
@@ -1855,7 +1855,7 @@ 
      * Creates the form to create / edit an exercise
      * @param FormValidator $form
      */
-    public function createForm($form, $type='full')
+    public function createForm($form, $type = 'full')
     {
         if (empty($type)) {
             $type = 'full';
@@ -1886,7 +1886,7 @@ 
             'Width' => '100%',
             'Height' => '150',
         );
-        if (is_array($type)){
+        if (is_array($type)) {
             $editor_config = array_merge($editor_config, $type);
         }
 
@@ -1940,13 +1940,13 @@ 
                     '2',
                     array('id' => 'exerciseType_2')
                 );
-                $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')), '');
+                $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')), '');
 
                 // Type of results display on the final page
                 $radios_results_disabled = array();
                 $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2', array('id'=>'result_disabled_2'));
+                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2'));
                 //$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ExamModeWithFinalScoreShowOnlyFinalScoreWithCategoriesIfAvailable'),  '3', array('id'=>'result_disabled_3','onclick' => 'check_results_disabled()'));
 
                 $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
@@ -1954,8 +1954,8 @@ 
                 // Type of questions disposition on page
                 $radios = array();
 
-                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
-                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
+                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
+                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
                 $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
 
@@ -1965,33 +1965,33 @@ 
 
                     // feedback type
                     $radios_feedback = array();
-                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
+                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'), '0', array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
 
                     if (api_get_setting('enable_quiz_scenario') == 'true') {
-                        $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()'));
+                        $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1', 'onclick' => 'check_direct_feedback()'));
                     }
-                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2'));
-                    $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')));
+                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'), '2', array('id' =>'exerciseType_2'));
+                    $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')));
 
                     //$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"');
                     $radios_results_disabled = array();
                     $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-                    $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
+                    $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
 
                     // Type of questions disposition on page
                     $radios = array();
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1');
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2');
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1');
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2');
                     $form->addGroup($radios, null, get_lang('ExerciseType'));
 
                 } else {
                     //Show options freeze
                     $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-                    $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
+                    $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
                     $result_disable_group->freeze();
 
                     //we force the options to the DirectFeedback exercisetype
@@ -1999,8 +1999,8 @@ 
                     $form->addElement('hidden', 'exerciseType', ONE_PER_PAGE);
 
                     // Type of questions disposition on page
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
                     $type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
                     $type_group->freeze();
@@ -2132,26 +2132,26 @@ 
 
                 // number of random question
 
-                $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10 ;
+                $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10;
                 $option = range(0, $max);
                 $option[0] = get_lang('No');
                 $option[-1] = get_lang('AllQuestionsShort');
-                $form->addElement('select', 'randomQuestions',array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions'));
+                $form->addElement('select', 'randomQuestions', array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions'));
 
                 // Random answers
                 $radios_random_answers = array();
-                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'),'1');
-                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'),'0');
+                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'), '1');
+                $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'), '0');
                 $form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), '');
 
                 // Random by category
-                $form->addElement('html','<div class="clear">&nbsp;</div>');
+                $form->addElement('html', '<div class="clear">&nbsp;</div>');
                 $radiocat = array();
-                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1');
-                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2');
-                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'),'0');
+                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'), '1');
+                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'), '2');
+                $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'), '0');
                 $radioCatGroup = $form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), '');
-                $form->addElement('html','<div class="clear">&nbsp;</div>');
+                $form->addElement('html', '<div class="clear">&nbsp;</div>');
 
                 // add the radio display the category name for student
                 $radio_display_cat_name = array();
@@ -2172,36 +2172,36 @@ 
             );
 
             // Exercise time limit
-            $form->addElement('checkbox', 'activate_start_date_check',null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
+            $form->addElement('checkbox', 'activate_start_date_check', null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
 
             $var = Exercise::selectTimeLimit();
 
             if (($this->start_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="start_date_div" style="display:block;">');
+                $form->addElement('html', '<div id="start_date_div" style="display:block;">');
             else
-                $form->addElement('html','<div id="start_date_div" style="display:none;">');
+                $form->addElement('html', '<div id="start_date_div" style="display:none;">');
 
             $form->addElement('date_time_picker', 'start_time');
 
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
-            $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
+            $form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
 
             if (($this->end_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="end_date_div" style="display:block;">');
+                $form->addElement('html', '<div id="end_date_div" style="display:block;">');
             else
-                $form->addElement('html','<div id="end_date_div" style="display:none;">');
+                $form->addElement('html', '<div id="end_date_div" style="display:none;">');
 
             $form->addElement('date_time_picker', 'end_time');
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
             //$check_option=$this->selectType();
             $diplay = 'block';
             $form->addElement('checkbox', 'propagate_neg', null, get_lang('PropagateNegativeResults'));
-            $form->addElement('html','<div class="clear">&nbsp;</div>');
+            $form->addElement('html', '<div class="clear">&nbsp;</div>');
             $form->addElement('checkbox', 'review_answers', null, get_lang('ReviewAnswers'));
 
-            $form->addElement('html','<div id="divtimecontrol"  style="display:'.$diplay.';">');
+            $form->addElement('html', '<div id="divtimecontrol"  style="display:'.$diplay.';">');
 
             //Timer control
             //$time_hours_option = range(0,12);
@@ -2217,12 +2217,12 @@ 
                     'onload' => 'check_load_time()',
                 )
             );
-            $expired_date = (int)$this->selectExpiredTime();
+            $expired_date = (int) $this->selectExpiredTime();
 
-            if (($expired_date!='0')) {
-                $form->addElement('html','<div id="timercontrol" style="display:block;">');
+            if (($expired_date != '0')) {
+                $form->addElement('html', '<div id="timercontrol" style="display:block;">');
             } else {
-                $form->addElement('html','<div id="timercontrol" style="display:none;">');
+                $form->addElement('html', '<div id="timercontrol" style="display:none;">');
             }
             $form->addText(
                 'enabletimercontroltotalminutes',
@@ -2233,7 +2233,7 @@ 
                     'cols-size' => [2, 2, 8]
                 ]
             );
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
             $form->addElement(
                 'text',
@@ -2255,23 +2255,23 @@ 
             $defaults = array();
 
             if (api_get_setting('search_enabled') === 'true') {
-                require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-                $form->addElement ('checkbox', 'index_document','', get_lang('SearchFeatureDoIndexDocument'));
-                $form->addElement ('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
+                $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
+                $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
 
                 $specific_fields = get_specific_field_list();
 
                 foreach ($specific_fields as $specific_field) {
-                    $form->addElement ('text', $specific_field['code'], $specific_field['name']);
+                    $form->addElement('text', $specific_field['code'], $specific_field['name']);
                     $filter = array(
                         'c_id' => api_get_course_int_id(),
                         'field_id' => $specific_field['id'],
                         'ref_id' => $this->id,
-                        'tool_id' => "'" . TOOL_QUIZ . "'"
+                        'tool_id' => "'".TOOL_QUIZ."'"
                     );
                     $values = get_specific_field_values_list($filter, array('value'));
-                    if ( !empty($values) ) {
+                    if (!empty($values)) {
                         $arr_str_values = array();
                         foreach ($values as $value) {
                             $arr_str_values[] = $value['value'];
@@ -2282,8 +2282,8 @@ 
                 //$form->addElement ('html','</div>');
             }
 
-            $form->addElement('html','</div>');  //End advanced setting
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>'); //End advanced setting
+            $form->addElement('html', '</div>');
         }
 
         // submit
@@ -2303,10 +2303,10 @@ 
         }
 
         // defaults
-        if ($type=='full') {
+        if ($type == 'full') {
             if ($this->id > 0) {
                 if ($this->random > $this->selectNbrQuestions()) {
-                    $defaults['randomQuestions'] =  $this->selectNbrQuestions();
+                    $defaults['randomQuestions'] = $this->selectNbrQuestions();
                 } else {
                     $defaults['randomQuestions'] = $this->random;
                 }
@@ -2333,8 +2333,8 @@ 
                     $defaults['activate_end_date_check'] = 1;
                 }
 
-                $defaults['start_time'] = ($this->start_time!='0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00');
-                $defaults['end_time'] = ($this->end_time!='0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time()+84600);
+                $defaults['start_time'] = ($this->start_time != '0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00');
+                $defaults['end_time'] = ($this->end_time != '0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time() + 84600);
 
                 // Get expired time
                 if ($this->expired_time != '0') {
@@ -2355,7 +2355,7 @@ 
                 $defaults['text_when_finished'] = "";
                 $defaults['start_time'] = date('Y-m-d 12:00:00');
                 $defaults['display_category_name'] = 1;
-                $defaults['end_time']   = date('Y-m-d 12:00:00', time()+84600);
+                $defaults['end_time']   = date('Y-m-d 12:00:00', time() + 84600);
                 $defaults['pass_percentage'] = '';
                 $defaults['end_button'] = $this->selectEndButton();
                 $defaults['question_selection_type'] = 1;
@@ -2441,7 +2441,7 @@ 
             $end_time = $form->getSubmitValue('end_time');
             $this->end_time = api_get_utc_datetime($end_time);
         } else {
-            $this->end_time   = '0000-00-00 00:00:00';
+            $this->end_time = '0000-00-00 00:00:00';
         }
 
         if ($form->getSubmitValue('enabletimercontrol') == 1) {
@@ -2454,9 +2454,9 @@ 
         }
 
         if ($form->getSubmitValue('randomAnswers') == 1) {
-            $this->random_answers=1;
+            $this->random_answers = 1;
         } else {
-            $this->random_answers=0;
+            $this->random_answers = 0;
         }
         $this->save($type);
     }
@@ -2468,9 +2468,9 @@ 
         }
         $course_id = api_get_course_id();
 
-        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) . 'specific_fields_manager.lib.php';
+        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).'specific_fields_manager.lib.php';
 
         $specific_fields = get_specific_field_list();
         $ic_slide = new IndexableChunk();
@@ -2480,7 +2480,7 @@ 
             if (isset($_REQUEST[$specific_field['code']])) {
                 $sterms = trim($_REQUEST[$specific_field['code']]);
                 if (!empty($sterms)) {
-                    $all_specific_terms .= ' '. $sterms;
+                    $all_specific_terms .= ' '.$sterms;
                     $sterms = explode(',', $sterms);
                     foreach ($sterms as $sterm) {
                         $ic_slide->addTerm(trim($sterm), $specific_field['code']);
@@ -2497,15 +2497,15 @@ 
         $xapian_data = array(
             SE_COURSE_ID => $course_id,
             SE_TOOL_ID => TOOL_QUIZ,
-            SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id),
-            SE_USER => (int)api_get_user_id(),
+            SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id),
+            SE_USER => (int) api_get_user_id(),
         );
         $ic_slide->xapian_data = serialize($xapian_data);
-        $exercise_description = $all_specific_terms .' '. $this->description;
+        $exercise_description = $all_specific_terms.' '.$this->description;
         $ic_slide->addValue("content", $exercise_description);
 
         $di = new ChamiloIndexer();
-        isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+        isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
         $di->connectDb(NULL, NULL, $lang);
         $di->addChunk($ic_slide);
 
@@ -2524,7 +2524,7 @@ 
     function search_engine_edit()
     {
         // update search enchine 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();
 
             // actually, it consists on delete terms from db,
@@ -2536,9 +2536,9 @@ 
             $res = Database::query($sql);
 
             if (Database::num_rows($res) > 0) {
-                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) . 'specific_fields_manager.lib.php');
+                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).'specific_fields_manager.lib.php');
 
                 $se_ref = Database::fetch_array($res);
                 $specific_fields = get_specific_field_list();
@@ -2549,7 +2549,7 @@ 
                     delete_all_specific_field_value($course_id, $specific_field['id'], TOOL_QUIZ, $this->id);
                     if (isset($_REQUEST[$specific_field['code']])) {
                         $sterms = trim($_REQUEST[$specific_field['code']]);
-                        $all_specific_terms .= ' '. $sterms;
+                        $all_specific_terms .= ' '.$sterms;
                         $sterms = explode(',', $sterms);
                         foreach ($sterms as $sterm) {
                             $ic_slide->addTerm(trim($sterm), $specific_field['code']);
@@ -2565,17 +2565,17 @@ 
                 $xapian_data = array(
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_QUIZ,
-                    SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id),
+                    SE_USER => (int) api_get_user_id(),
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $exercise_description = $all_specific_terms .' '. $this->description;
+                $exercise_description = $all_specific_terms.' '.$this->description;
                 $ic_slide->addValue("content", $exercise_description);
 
                 $di = new ChamiloIndexer();
-                isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+                isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(NULL, NULL, $lang);
-                $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
@@ -2600,7 +2600,7 @@ 
     function search_engine_delete()
     {
         // remove from search engine 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();
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
             $sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL LIMIT 1';
@@ -2608,19 +2608,19 @@ 
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
                 $row = Database::fetch_array($res);
-                require_once(api_get_path(LIBRARY_PATH) .'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
                 unset($di);
                 $tbl_quiz_question = Database::get_course_table(TABLE_QUIZ_QUESTION);
-                foreach ( $this->questionList as $question_i) {
+                foreach ($this->questionList as $question_i) {
                     $sql = 'SELECT type FROM %s WHERE id=%s';
                     $sql = sprintf($sql, $tbl_quiz_question, $question_i);
                     $qres = Database::query($sql);
                     if (Database::num_rows($qres) > 0) {
                         $qrow = Database::fetch_array($qres);
                         $objQuestion = Question::getInstance($qrow['type']);
-                        $objQuestion = Question::read((int)$question_i);
+                        $objQuestion = Question::read((int) $question_i);
                         $objQuestion->search_engine_edit($this->id, FALSE, TRUE);
                         unset($objQuestion);
                     }
@@ -2631,7 +2631,7 @@ 
             Database::query($sql);
 
             // remove terms from db
-            require_once api_get_path(LIBRARY_PATH) .'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_QUIZ, $this->id);
         }
     }
@@ -2726,7 +2726,7 @@ 
      */
     public function copy_exercise()
     {
-        $exercise_obj= new Exercise();
+        $exercise_obj = new Exercise();
         $exercise_obj = $this;
 
         // force the creation of a new exercise
@@ -2798,25 +2798,25 @@ 
             $lp_id = 0;
         }
         if (empty($lp_item_id)) {
-            $lp_item_id   = 0;
+            $lp_item_id = 0;
         }
         if (empty($lp_item_view_id)) {
             $lp_item_view_id = 0;
         }
-        $condition = ' WHERE exe_exo_id 	= ' . "'" . $this->id . "'" .' AND
-					   exe_user_id 			= ' . "'" . api_get_user_id() . "'" . ' AND
-					   c_id                 = ' . api_get_course_int_id() . ' AND
-					   status 				= ' . "'" . Database::escape_string($status). "'" . ' AND
-					   orig_lp_id 			= ' . "'" . $lp_id . "'" . ' AND
-					   orig_lp_item_id 		= ' . "'" . $lp_item_id . "'" . ' AND
-                       orig_lp_item_view_id = ' . "'" . $lp_item_view_id . "'" . ' AND
-					   session_id 			= ' . "'" . api_get_session_id() . "' LIMIT 1"; //Adding limit 1 just in case
+        $condition = ' WHERE exe_exo_id 	= '."'".$this->id."'".' AND
+					   exe_user_id 			= ' . "'".api_get_user_id()."'".' AND
+					   c_id                 = ' . api_get_course_int_id().' AND
+					   status 				= ' . "'".Database::escape_string($status)."'".' AND
+					   orig_lp_id 			= ' . "'".$lp_id."'".' AND
+					   orig_lp_item_id 		= ' . "'".$lp_item_id."'".' AND
+                       orig_lp_item_view_id = ' . "'".$lp_item_view_id."'".' AND
+					   session_id 			= ' . "'".api_get_session_id()."' LIMIT 1"; //Adding limit 1 just in case
 
         $sql_track = 'SELECT * FROM '.$track_exercises.$condition;
 
         $result = Database::query($sql_track);
         $new_array = array();
-        if (Database::num_rows($result) > 0 ) {
+        if (Database::num_rows($result) > 0) {
             $new_array = Database::fetch_array($result, 'ASSOC');
             $new_array['num_exe'] = Database::num_rows($result);
         }
@@ -2859,12 +2859,12 @@ 
         $questionList = array_map('intval', $questionList);
 
         $params = array(
-            'exe_exo_id' => $this->id ,
+            'exe_exo_id' => $this->id,
             'exe_user_id' => api_get_user_id(),
             'c_id' => api_get_course_int_id(),
             'status' =>  'incomplete',
             'session_id'  => api_get_session_id(),
-            'data_tracking'  => implode(',', $questionList) ,
+            'data_tracking'  => implode(',', $questionList),
             'start_date' => api_get_utc_datetime(),
             'orig_lp_id' => $safe_lp_id,
             'orig_lp_item_id'  => $safe_lp_item_id,
@@ -2896,7 +2896,7 @@ 
         $nbrQuestions = $this->get_count_question_list();
 
         $all_button = $html = $label = '';
-        $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']):null;
+        $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']) : null;
 
         if ($this->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT && $this->type == ONE_PER_PAGE) {
             $urlTitle = get_lang('ContinueTest');
@@ -2907,7 +2907,7 @@ 
 
             $html .= Display::url(
                 $urlTitle,
-                'exercise_submit_modal.php?' . http_build_query([
+                'exercise_submit_modal.php?'.http_build_query([
                     'learnpath_id' => $safe_lp_id,
                     'learnpath_item_id' => $safe_lp_item_id,
                     'learnpath_item_view_id' => $safe_lp_item_view_id,
@@ -2924,7 +2924,7 @@ 
                     'data-size' => 'md'
                 ]
             );
-            $html .='<br />';
+            $html .= '<br />';
         } else {
             // User
             if (api_is_allowed_to_session_edit()) {
@@ -2949,7 +2949,7 @@ 
 
                     //Next question
                     if (!empty($questions_in_media)) {
-                        $questions_in_media = "['".implode("','",$questions_in_media)."']";
+                        $questions_in_media = "['".implode("','", $questions_in_media)."']";
                         $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_question_list('.$questions_in_media.'); ">'.$label.'</a>';
                     } else {
                         $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_now('.$question_id.', \'\', \''.$currentAnswer.'\'); ">'.$label.'</a>';
@@ -2967,7 +2967,7 @@ 
                     }
 					$class .= ' question-validate-btn'; // used to select it with jquery
                     $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
-                    $all_button .= '&nbsp;' . Display::span(null, ['id' => 'save_all_reponse']);
+                    $all_button .= '&nbsp;'.Display::span(null, ['id' => 'save_all_reponse']);
                     $html .= $all_button;
                 }
             }
@@ -3209,8 +3209,8 @@ 
             $params = array();
             $params['course_id'] = $course_id;
             $params['session_id'] = api_get_session_id();
-            $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
-            $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
+            $params['user_id'] = isset($exe_info['exe_user_id']) ? $exe_info['exe_user_id'] : api_get_user_id();
+            $params['exercise_id'] = isset($exe_info['exe_exo_id']) ? $exe_info['exe_exo_id'] : $this->id;
             $params['question_id'] = $questionId;
             $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
 
@@ -3266,10 +3266,10 @@ 
             $answer = $objAnswerTmp->selectAnswer($answerId);
             $answerComment = $objAnswerTmp->selectComment($answerId);
             $answerCorrect = $objAnswerTmp->isCorrect($answerId);
-            $answerWeighting = (float)$objAnswerTmp->selectWeighting($answerId);
+            $answerWeighting = (float) $objAnswerTmp->selectWeighting($answerId);
             $answerAutoId = $objAnswerTmp->selectAutoId($answerId);
 
-            $answer_correct_array[$answerId] = (bool)$answerCorrect;
+            $answer_correct_array[$answerId] = (bool) $answerCorrect;
 
             if ($debug) {
                 error_log("answer auto id: $answerAutoId ");
@@ -3278,7 +3278,7 @@ 
 
             // Delineation
             $delineation_cord = $objAnswerTmp->selectHotspotCoordinates(1);
-            $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+            $answer_delineation_destination = $objAnswerTmp->selectDestination(1);
 
             switch ($answerType) {
                 // for unique answer
@@ -3291,7 +3291,7 @@ 
                                     exe_id = '".$exeId."' AND
                                     question_id= '".$questionId."'";
                         $result = Database::query($sql);
-                        $choice = Database::result($result,0,"answer");
+                        $choice = Database::result($result, 0, "answer");
 
                         $studentChoice = $choice == $answerAutoId ? 1 : 0;
                         if ($studentChoice) {
@@ -3342,7 +3342,7 @@ 
                     } else {
                         // If no result then the user just hit don't know
                         $studentChoice = 3;
-                        $questionScore  +=  $doubt_score;
+                        $questionScore += $doubt_score;
                     }
                     $totalScore = $questionScore;
                     break;
@@ -3358,17 +3358,17 @@ 
                         }
 
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
 
                         if ($studentChoice) {
-                            $questionScore  +=$answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
 
                         if (isset($studentChoice)) {
-                            $questionScore  += $answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     }
                     $totalScore += $answerWeighting;
@@ -3386,16 +3386,16 @@ 
                             $choice[$ind] = 1;
                         }
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
                         if ($studentChoice) {
-                            $questionScore +=$answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
                         if (isset($studentChoice)) {
                             $questionScore += $answerWeighting;
                         }
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
                     }
                     $totalScore += $answerWeighting;
                     if ($debug) error_log("studentChoice: $studentChoice");
@@ -3407,7 +3407,7 @@ 
                         $resultans = Database::query($sql);
                         while ($row = Database::fetch_array($resultans)) {
                             $ind = $row['answer'];
-                            $result = explode(':',$ind);
+                            $result = explode(':', $ind);
                             if (isset($result[0])) {
                                 $my_answer_id = isset($result[0]) ? $result[0] : '';
                                 $option = isset($result[1]) ? $result[1] : '';
@@ -3528,10 +3528,10 @@ 
                             }
                             // adds the piece of text that is before the blank
                             //and ends with '[' into a general storage array
-                            $real_text[] = api_substr($temp, 0, $pos +1);
-                            $answer .= api_substr($temp, 0, $pos +1);
+                            $real_text[] = api_substr($temp, 0, $pos + 1);
+                            $answer .= api_substr($temp, 0, $pos + 1);
                             //take the string remaining (after the last "[" we found)
-                            $temp = api_substr($temp, $pos +1);
+                            $temp = api_substr($temp, $pos + 1);
                             // quit the loop if there are no more blanks, and update $pos to the position of next ']'
                             if (($pos = api_strpos($temp, ']')) === false) {
                                 // adds the end of the text
@@ -3567,7 +3567,7 @@ 
                             //put the contents of the [] answer tag into correct_tags[]
                             $correct_tags[] = api_substr($temp, 0, $pos);
                             $j++;
-                            $temp = api_substr($temp, $pos +1);
+                            $temp = api_substr($temp, $pos + 1);
                         }
                         $answer = '';
                         $real_correct_tags = $correct_tags;
@@ -3590,7 +3590,7 @@ 
                                 } elseif (!empty($user_tags[$i])) {
                                     // else if the word entered by the student IS NOT the same as the one defined by the professor
                                     // adds the word in red at the end of the string, and strikes it
-                                    $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                    $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>';
                                 } else {
                                     // adds a tabulation if no word has been typed by the student
                                     $answer .= ''; // remove &nbsp; that causes issue
@@ -3609,17 +3609,17 @@ 
                                 } elseif (!empty ($user_tags[$i])) {
                                     // else if the word entered by the student IS NOT the same as the one defined by the professor
                                     // adds the word in red at the end of the string, and strikes it
-                                    $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                    $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>';
                                 } else {
                                     // adds a tabulation if no word has been typed by the student
-                                    $answer .= '';  // remove &nbsp; that causes issue
+                                    $answer .= ''; // remove &nbsp; that causes issue
                                 }
                             }
 
                             // adds the correct word, followed by ] to close the blank
-                            $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
-                            if (isset($real_text[$i +1])) {
-                                $answer .= $real_text[$i +1];
+                            $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]';
+                            if (isset($real_text[$i + 1])) {
+                                $answer .= $real_text[$i + 1];
                             }
                         }
                     } else {
@@ -3753,10 +3753,10 @@ 
                         }
                         // adds the piece of text that is before the blank
                         //and ends with '[' into a general storage array
-                        $realText[] = api_substr($temp, 0, $pos +1);
-                        $answer .= api_substr($temp, 0, $pos +1);
+                        $realText[] = api_substr($temp, 0, $pos + 1);
+                        $answer .= api_substr($temp, 0, $pos + 1);
                         //take the string remaining (after the last "[" we found)
-                        $temp = api_substr($temp, $pos +1);
+                        $temp = api_substr($temp, $pos + 1);
                         // quit the loop if there are no more blanks, and update $pos to the position of next ']'
                         if (($pos = api_strpos($temp, ']')) === false) {
                             // adds the end of the text
@@ -3790,7 +3790,7 @@ 
                         //put the contents of the [] answer tag into correct_tags[]
                         $correctTags[] = api_substr($temp, 0, $pos);
                         $j++;
-                        $temp = api_substr($temp, $pos +1);
+                        $temp = api_substr($temp, $pos + 1);
                     }
                     $answer = '';
                     $realCorrectTags = $correctTags;
@@ -3810,22 +3810,22 @@ 
                         } elseif (!empty($userTags[$i])) {
                             // else if the word entered by the student IS NOT the same as the one defined by the professor
                             // adds the word in red at the end of the string, and strikes it
-                            $answer .= '<font color="red"><s>' . $userTags[$i] . '</s></font>';
+                            $answer .= '<font color="red"><s>'.$userTags[$i].'</s></font>';
                         } else {
                             // adds a tabulation if no word has been typed by the student
                             $answer .= ''; // remove &nbsp; that causes issue
                         }
                         // adds the correct word, followed by ] to close the blank
-                        $answer .= ' / <font color="green"><b>' . $realCorrectTags[$i] . '</b></font>]';
-                        if (isset($realText[$i +1])) {
-                            $answer .= $realText[$i +1];
+                        $answer .= ' / <font color="green"><b>'.$realCorrectTags[$i].'</b></font>]';
+                        if (isset($realText[$i + 1])) {
+                            $answer .= $realText[$i + 1];
                         }
                     }
                     break;
                 // for free answer
                 case FREE_ANSWER:
                     if ($from_database) {
-                        $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
+                        $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
                                    WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
                         $resq = Database::query($query);
                         $data = Database::fetch_array($resq);
@@ -3836,9 +3836,9 @@ 
                         $questionScore = $data['marks'];
 
                         if ($questionScore == -1) {
-                            $totalScore+= 0;
+                            $totalScore += 0;
                         } else {
-                            $totalScore+= $questionScore;
+                            $totalScore += $questionScore;
                         }
                         if ($questionScore == '') {
                             $questionScore = 0;
@@ -3859,14 +3859,14 @@ 
                         $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
                                    WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
                         $resq   = Database::query($query);
-                        $choice = Database::result($resq,0,'answer');
+                        $choice = Database::result($resq, 0, 'answer');
                         $choice = str_replace('\r\n', '', $choice);
                         $choice = stripslashes($choice);
-                        $questionScore = Database::result($resq,0,"marks");
-                        if ($questionScore==-1) {
-                            $totalScore+=0;
+                        $questionScore = Database::result($resq, 0, "marks");
+                        if ($questionScore == -1) {
+                            $totalScore += 0;
                         } else {
-                            $totalScore+=$questionScore;
+                            $totalScore += $questionScore;
                         }
                         $arrques = $questionName;
                         $arrans  = $choice;
@@ -3911,7 +3911,7 @@ 
 
                         while ($a_answers = Database::fetch_array($res_answers)) {
                             $i_answer_id = $a_answers['id']; //3
-                            $s_answer_label = $a_answers['answer'];  // your daddy - your mother
+                            $s_answer_label = $a_answers['answer']; // your daddy - your mother
                             $i_answer_correct_answer = $a_answers['correct']; //1 - 2
                             $i_answer_id_auto = $a_answers['id_auto']; // 3 - 4
 
@@ -3963,8 +3963,8 @@ 
 
                             if ($show_result) {
                                 echo '<tr>';
-                                echo '<td>' . $s_answer_label . '</td>';
-                                echo '<td>' . $user_answer;
+                                echo '<td>'.$s_answer_label.'</td>';
+                                echo '<td>'.$user_answer;
 
                                 if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                                     if (isset($real_list[$i_answer_correct_answer])) {
@@ -4073,7 +4073,7 @@ 
                     if ($from_database) {
                         // getting the user answer
                         $TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
-                        $query   = "SELECT hotspot_correct, hotspot_coordinate
+                        $query = "SELECT hotspot_correct, hotspot_coordinate
                                     FROM $TBL_TRACK_HOTSPOT
                                     WHERE
                                         hotspot_exe_id = '".$exeId."' AND
@@ -4081,20 +4081,20 @@ 
                                         hotspot_answer_id='1'";
                         //by default we take 1 because it's a delineation
                         $resq = Database::query($query);
-                        $row = Database::fetch_array($resq,'ASSOC');
+                        $row = Database::fetch_array($resq, 'ASSOC');
 
                         $choice = $row['hotspot_correct'];
                         $user_answer = $row['hotspot_coordinate'];
 
                         // THIS is very important otherwise the poly_compile will throw an error!!
                         // round-up the coordinates
-                        $coords = explode('/',$user_answer);
+                        $coords = explode('/', $user_answer);
                         $user_array = '';
                         foreach ($coords as $coord) {
-                            list($x,$y) = explode(';',$coord);
+                            list($x, $y) = explode(';', $coord);
                             $user_array .= round($x).';'.round($y).'/';
                         }
-                        $user_array = substr($user_array,0,-1);
+                        $user_array = substr($user_array, 0, -1);
                     } else {
                         if (!empty($studentChoice)) {
                             $newquestionList[] = $questionId;
@@ -4104,13 +4104,13 @@ 
                             $studentChoice = $choice[$answerId];
                             $questionScore += $answerWeighting;
 
-                            if ($hotspot_delineation_result[1]==1) {
+                            if ($hotspot_delineation_result[1] == 1) {
                                 $totalScore += $answerWeighting; //adding the total
                             }
                         }
                     }
-                    $_SESSION['hotspot_coord'][1]	= $delineation_cord;
-                    $_SESSION['hotspot_dest'][1]	= $answer_delineation_destination;
+                    $_SESSION['hotspot_coord'][1] = $delineation_cord;
+                    $_SESSION['hotspot_dest'][1] = $answer_delineation_destination;
                     break;
             } // end switch Answertype
 
@@ -4168,7 +4168,7 @@ 
                                 $results_disabled
                             );
                             //}
-                        } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE ) {
+                        } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
                             //	if ($origin!='learnpath') {
                             ExerciseShowFunctions::display_multiple_answer_combination_true_false(
                                 $feedback_type,
@@ -4185,11 +4185,11 @@ 
                             //}
                         } elseif ($answerType == FILL_IN_BLANKS) {
                             //if ($origin!='learnpath') {
-                            ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer,0,0, $results_disabled);
+                            ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer, 0, 0, $results_disabled);
                             //	}
                         } elseif ($answerType == CALCULATED_ANSWER) {
                             //if ($origin!='learnpath') {
-                            ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer,0,0);
+                            ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer, 0, 0);
                             //  }
                         } elseif ($answerType == FREE_ANSWER) {
                             //if($origin != 'learnpath') {
@@ -4243,13 +4243,13 @@ 
                             $user_answer = $_SESSION['exerciseResultCoordinates'][$questionId];
 
                             //round-up the coordinates
-                            $coords = explode('/',$user_answer);
+                            $coords = explode('/', $user_answer);
                             $user_array = '';
                             foreach ($coords as $coord) {
-                                list($x,$y) = explode(';',$coord);
+                                list($x, $y) = explode(';', $coord);
                                 $user_array .= round($x).';'.round($y).'/';
                             }
-                            $user_array = substr($user_array,0,-1);
+                            $user_array = substr($user_array, 0, -1);
 
                             if ($next) {
 
@@ -4276,7 +4276,7 @@ 
                                 //$overlap = round(polygons_overlap($poly_answer,$poly_user));
                                 // //this is an area in pixels
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+                                    error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
                                 }
 
                                 if ($overlap < 1) {
@@ -4289,43 +4289,43 @@ 
                                     // that is overlapped by the user's polygon
                                     $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+                                        error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
                                     }
                                     // the final missing area is the percentage of the initial polygon
                                     // that is not overlapped by the user's polygon
                                     $final_missing = 100 - $final_overlap;
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+                                        error_log(__LINE__.' - Final missing is '.$final_missing, 0);
                                     }
                                     // the final excess area is the percentage of the initial polygon's size
                                     // that is covered by the user's polygon outside of the initial polygon
                                     $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+                                        error_log(__LINE__.' - Final excess is '.$final_excess, 0);
                                     }
                                 }
 
                                 //checking the destination parameters parsing the "@@"
-                                $destination_items= explode('@@', $answerDestination);
+                                $destination_items = explode('@@', $answerDestination);
                                 $threadhold_total = $destination_items[0];
-                                $threadhold_items=explode(';',$threadhold_total);
+                                $threadhold_items = explode(';', $threadhold_total);
                                 $threadhold1 = $threadhold_items[0]; // overlap
                                 $threadhold2 = $threadhold_items[1]; // excess
-                                $threadhold3 = $threadhold_items[2];	 //missing
+                                $threadhold3 = $threadhold_items[2]; //missing
 
                                 // if is delineation
-                                if ($answerId===1) {
+                                if ($answerId === 1) {
                                     //setting colors
-                                    if ($final_overlap>=$threadhold1) {
-                                        $overlap_color=true; //echo 'a';
+                                    if ($final_overlap >= $threadhold1) {
+                                        $overlap_color = true; //echo 'a';
                                     }
                                     //echo $excess.'-'.$threadhold2;
-                                    if ($final_excess<=$threadhold2) {
-                                        $excess_color=true; //echo 'b';
+                                    if ($final_excess <= $threadhold2) {
+                                        $excess_color = true; //echo 'b';
                                     }
                                     //echo '--------'.$missing.'-'.$threadhold3;
-                                    if ($final_missing<=$threadhold3) {
-                                        $missing_color=true; //echo 'c';
+                                    if ($final_missing <= $threadhold3) {
+                                        $missing_color = true; //echo 'c';
                                     }
 
                                     // if pass
@@ -4334,67 +4334,67 @@ 
                                         $final_missing <= $threadhold3 &&
                                         $final_excess <= $threadhold2
                                     ) {
-                                        $next=1; //go to the oars
-                                        $result_comment=get_lang('Acceptable');
-                                        $final_answer = 1;	// do not update with  update_exercise_attempt
+                                        $next = 1; //go to the oars
+                                        $result_comment = get_lang('Acceptable');
+                                        $final_answer = 1; // do not update with  update_exercise_attempt
                                     } else {
-                                        $next=0;
-                                        $result_comment=get_lang('Unacceptable');
-                                        $comment=$answerDestination=$objAnswerTmp->selectComment(1);
-                                        $answerDestination=$objAnswerTmp->selectDestination(1);
+                                        $next = 0;
+                                        $result_comment = get_lang('Unacceptable');
+                                        $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+                                        $answerDestination = $objAnswerTmp->selectDestination(1);
                                         //checking the destination parameters parsing the "@@"
-                                        $destination_items= explode('@@', $answerDestination);
+                                        $destination_items = explode('@@', $answerDestination);
                                     }
-                                } elseif($answerId>1) {
+                                } elseif ($answerId > 1) {
                                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
-                                        if ($debug>0) {
-                                            error_log(__LINE__.' - answerId is of type noerror',0);
+                                        if ($debug > 0) {
+                                            error_log(__LINE__.' - answerId is of type noerror', 0);
                                         }
                                         //type no error shouldn't be treated
                                         $next = 1;
                                         continue;
                                     }
-                                    if ($debug>0) {
-                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);
+                                    if ($debug > 0) {
+                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
                                     }
                                     //check the intersection between the oar and the user
                                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
                                     //echo 'official';print_r($x_list);print_r($y_list);
                                     //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
-                                    $inter= $result['success'];
+                                    $inter = $result['success'];
 
                                     //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
-                                    $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
+                                    $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId);
 
-                                    $poly_answer = convert_coordinates($delineation_cord,'|');
-                                    $max_coord = poly_get_max($poly_user,$poly_answer);
-                                    $poly_answer_compiled = poly_compile($poly_answer,$max_coord);
-                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                                    $poly_answer = convert_coordinates($delineation_cord, '|');
+                                    $max_coord = poly_get_max($poly_user, $poly_answer);
+                                    $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
 
                                     if ($overlap == false) {
                                         //all good, no overlap
                                         $next = 1;
                                         continue;
                                     } else {
-                                        if ($debug>0) {
-                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);
+                                        if ($debug > 0) {
+                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
                                         }
                                         $organs_at_risk_hit++;
                                         //show the feedback
-                                        $next=0;
-                                        $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
-                                        $answerDestination=$objAnswerTmp->selectDestination($answerId);
-
-                                        $destination_items= explode('@@', $answerDestination);
-                                        $try_hotspot=$destination_items[1];
-                                        $lp_hotspot=$destination_items[2];
-                                        $select_question_hotspot=$destination_items[3];
-                                        $url_hotspot=$destination_items[4];
+                                        $next = 0;
+                                        $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+                                        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+                                        $destination_items = explode('@@', $answerDestination);
+                                        $try_hotspot = $destination_items[1];
+                                        $lp_hotspot = $destination_items[2];
+                                        $select_question_hotspot = $destination_items[3];
+                                        $url_hotspot = $destination_items[4];
                                     }
                                 }
                             } else {	// the first delineation feedback
-                                if ($debug>0) {
-                                    error_log(__LINE__.' first',0);
+                                if ($debug > 0) {
+                                    error_log(__LINE__.' first', 0);
                                 }
                             }
                         } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
@@ -4402,7 +4402,7 @@ 
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
                                 'td',
-                                "$user_answer / " . Display::tag(
+                                "$user_answer / ".Display::tag(
                                     'strong',
                                     $answerMatching[$answerCorrect],
                                     ['style' => 'color: #008000; font-weight: bold;']
@@ -4542,7 +4542,7 @@ 
                                     $exeId,
                                     $questionId,
                                     $nano
-                                ) . '</td>
+                                ).'</td>
                                 </tr>
                                 </table>';
                             break;
@@ -4601,7 +4601,7 @@ 
 
                                 //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+                                    error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
                                 }
                                 if ($overlap < 1) {
                                     //shortcut to avoid complicated calculations
@@ -4612,17 +4612,17 @@ 
                                     // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
                                     $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+                                        error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
                                     }
                                     // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
                                     $final_missing = 100 - $final_overlap;
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+                                        error_log(__LINE__.' - Final missing is '.$final_missing, 0);
                                     }
                                     // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
                                     $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+                                        error_log(__LINE__.' - Final excess is '.$final_excess, 0);
                                     }
                                 }
 
@@ -4632,7 +4632,7 @@ 
                                 $threadhold_items = explode(';', $threadhold_total);
                                 $threadhold1 = $threadhold_items[0]; // overlap
                                 $threadhold2 = $threadhold_items[1]; // excess
-                                $threadhold3 = $threadhold_items[2];  //missing
+                                $threadhold3 = $threadhold_items[2]; //missing
                                 // if is delineation
                                 if ($answerId === 1) {
                                     //setting colors
@@ -4664,14 +4664,14 @@ 
                                 } elseif ($answerId > 1) {
                                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
                                         if ($debug > 0) {
-                                            error_log(__LINE__ . ' - answerId is of type noerror', 0);
+                                            error_log(__LINE__.' - answerId is of type noerror', 0);
                                         }
                                         //type no error shouldn't be treated
                                         $next = 1;
                                         continue;
                                     }
                                     if ($debug > 0) {
-                                        error_log(__LINE__ . ' - answerId is >1 so we\'re probably in OAR', 0);
+                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
                                     }
                                     //check the intersection between the oar and the user
                                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
@@ -4685,7 +4685,7 @@ 
                                     $poly_answer = convert_coordinates($delineation_cord, '|');
                                     $max_coord = poly_get_max($poly_user, $poly_answer);
                                     $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
-                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
 
                                     if ($overlap == false) {
                                         //all good, no overlap
@@ -4693,7 +4693,7 @@ 
                                         continue;
                                     } else {
                                         if ($debug > 0) {
-                                            error_log(__LINE__ . ' - Overlap is ' . $overlap . ': OAR hit', 0);
+                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
                                         }
                                         $organs_at_risk_hit++;
                                         //show the feedback
@@ -4705,12 +4705,12 @@ 
                                         $try_hotspot = $destination_items[1];
                                         $lp_hotspot = $destination_items[2];
                                         $select_question_hotspot = $destination_items[3];
-                                        $url_hotspot=$destination_items[4];
+                                        $url_hotspot = $destination_items[4];
                                     }
                                 }
                             } else {	// the first delineation feedback
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' first', 0);
+                                    error_log(__LINE__.' first', 0);
                                 }
                             }
                             break;
@@ -4732,7 +4732,7 @@ 
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
                                 'td',
-                                "$user_answer / " . Display::tag(
+                                "$user_answer / ".Display::tag(
                                     'strong',
                                     $answerMatching[$answerCorrect],
                                     ['style' => 'color: #008000; font-weight: bold;']
@@ -4818,7 +4818,7 @@ 
             //  we use the results from the session (from_db=0)
             // TODO Change this, because it is wrong to show the user
             //  some results that haven't been stored in the database yet
-            if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) {
+            if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION) {
 
                 if ($debug) error_log('$from AND this is a hotspot kind of question ');
 
@@ -4827,19 +4827,19 @@ 
                 if ($answerType == HOT_SPOT_DELINEATION) {
                     if (0) {
                         if ($overlap_color) {
-                            $overlap_color='green';
+                            $overlap_color = 'green';
                         } else {
-                            $overlap_color='red';
+                            $overlap_color = 'red';
                         }
                         if ($missing_color) {
-                            $missing_color='green';
+                            $missing_color = 'green';
                         } else {
-                            $missing_color='red';
+                            $missing_color = 'red';
                         }
                         if ($excess_color) {
-                            $excess_color='green';
+                            $excess_color = 'green';
                         } else {
-                            $excess_color='red';
+                            $excess_color = 'red';
                         }
                         if (!is_numeric($final_overlap)) {
                             $final_overlap = 0;
@@ -4851,33 +4851,33 @@ 
                             $final_excess = 0;
                         }
 
-                        if ($final_overlap>100) {
+                        if ($final_overlap > 100) {
                             $final_overlap = 100;
                         }
 
-                        $table_resume='<table class="data_table">
+                        $table_resume = '<table class="data_table">
                                 <tr class="row_odd" >
                                     <td></td>
-                                    <td ><b>' . get_lang('Requirements') . '</b></td>
-                                    <td><b>' . get_lang('YourAnswer') . '</b></td>
+                                    <td ><b>' . get_lang('Requirements').'</b></td>
+                                    <td><b>' . get_lang('YourAnswer').'</b></td>
                                 </tr>
                                 <tr class="row_even">
-                                    <td><b>' . get_lang('Overlap') . '</b></td>
-                                    <td>' . get_lang('Min') . ' ' . $threadhold1 . '</td>
-                                    <td><div style="color:' . $overlap_color . '">'
-                                        . (($final_overlap < 0) ? 0 : intval($final_overlap)) . '</div></td>
+                                    <td><b>' . get_lang('Overlap').'</b></td>
+                                    <td>' . get_lang('Min').' '.$threadhold1.'</td>
+                                    <td><div style="color:' . $overlap_color.'">'
+                                        . (($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
                                 </tr>
                                 <tr>
-                                    <td><b>' . get_lang('Excess') . '</b></td>
-                                    <td>' . get_lang('Max') . ' ' . $threadhold2 . '</td>
-                                    <td><div style="color:' . $excess_color . '">'
-                                        . (($final_excess < 0) ? 0 : intval($final_excess)) . '</div></td>
+                                    <td><b>' . get_lang('Excess').'</b></td>
+                                    <td>' . get_lang('Max').' '.$threadhold2.'</td>
+                                    <td><div style="color:' . $excess_color.'">'
+                                        . (($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
                                 </tr>
                                 <tr class="row_even">
-                                    <td><b>' . get_lang('Missing') . '</b></td>
-                                    <td>' . get_lang('Max') . ' ' . $threadhold3 . '</td>
-                                    <td><div style="color:' . $missing_color . '">'
-                                        . (($final_missing < 0) ? 0 : intval($final_missing)) . '</div></td>
+                                    <td><b>' . get_lang('Missing').'</b></td>
+                                    <td>' . get_lang('Max').' '.$threadhold3.'</td>
+                                    <td><div style="color:' . $missing_color.'">'
+                                        . (($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
                                 </tr>
                             </table>';
                         if ($next == 0) {
@@ -4892,20 +4892,20 @@ 
                             $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
                         }
 
-                        echo '<h1><div style="color:#333;">' . get_lang('Feedback') . '</div></h1>
+                        echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>
                             <p style="text-align:center">';
 
-                        $message = '<p>' . get_lang('YourDelineation') . '</p>';
+                        $message = '<p>'.get_lang('YourDelineation').'</p>';
                         $message .= $table_resume;
-                        $message .= '<br />' . get_lang('ResultIs') . ' ' . $result_comment . '<br />';
+                        $message .= '<br />'.get_lang('ResultIs').' '.$result_comment.'<br />';
                         if ($organs_at_risk_hit > 0) {
-                            $message .= '<p><b>' . get_lang('OARHit') . '</b></p>';
+                            $message .= '<p><b>'.get_lang('OARHit').'</b></p>';
                         }
-                        $message .='<p>' . $comment . '</p>';
+                        $message .= '<p>'.$comment.'</p>';
                         echo $message;
                     } else {
                         echo $hotspot_delineation_result[0]; //prints message
-                        $from_database = 1;  // the hotspot_solution.swf needs this variable
+                        $from_database = 1; // the hotspot_solution.swf needs this variable
                     }
 
                     //save the score attempts
@@ -4927,20 +4927,20 @@ 
                             $exerciseResultCoordinates[$quesId]
                         );
                     } else {
-                        if ($final_answer==0) {
+                        if ($final_answer == 0) {
                             $questionScore = 0;
-                            $answer=0;
+                            $answer = 0;
                             Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
                             if (is_array($exerciseResultCoordinates[$quesId])) {
-                                foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
-                                    Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,0,$val);
+                                foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) {
+                                    Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, 0, $val);
                                 }
                             }
                         } else {
                             Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
                             if (is_array($exerciseResultCoordinates[$quesId])) {
-                                foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
-                                    Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,$choice[$idx],$val);
+                                foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) {
+                                    Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, $choice[$idx], $val);
                                 }
                             }
                         }
@@ -4959,7 +4959,7 @@ 
                     echo "
                         <tr>
                             <td colspan=\"2\">
-                                <p><em>" . get_lang('HotSpot') . "</em></p>
+                                <p><em>" . get_lang('HotSpot')."</em></p>
 
                                 <div id=\"hotspot-solution-$questionId\"></div>
 
@@ -4997,7 +4997,7 @@ 
 
         if ($saved_results) {
             if ($debug) error_log("Save question results $saved_results");
-            if ($debug) error_log(print_r($choice ,1 ));
+            if ($debug) error_log(print_r($choice, 1));
 
             if (empty($choice)) {
                 $choice = 0;
@@ -5009,14 +5009,14 @@ 
                         $ans = $reply[$i];
                         Event::saveQuestionAttempt(
                             $questionScore,
-                            $ans . ':' . $choice[$ans],
+                            $ans.':'.$choice[$ans],
                             $quesId,
                             $exeId,
                             $i,
                             $this->id
                         );
                         if ($debug) {
-                            error_log('result =>' . $questionScore . ' ' . $ans . ':' . $choice[$ans]);
+                            error_log('result =>'.$questionScore.' '.$ans.':'.$choice[$ans]);
                         }
                     }
                 } else {
@@ -5027,7 +5027,7 @@ 
                     $reply = array_keys($choice);
 
                     if ($debug) {
-                        error_log("reply " . print_r($reply, 1) . "");
+                        error_log("reply ".print_r($reply, 1)."");
                     }
                     for ($i = 0; $i < sizeof($reply); $i++) {
                         $ans = $reply[$i];
@@ -5086,7 +5086,7 @@ 
 
                 Event::saveQuestionAttempt($questionScore, implode('|', $answer), $quesId, $exeId, 0, $this->id);
             } else {
-                Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0,$this->id);
+                Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
             }
         }
 
@@ -5096,8 +5096,8 @@ 
 
         if ($saved_results) {
             $stat_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-            $sql = 'UPDATE ' . $stat_table . ' SET
-                        exe_result = exe_result + ' . floatval($questionScore) . '
+            $sql = 'UPDATE '.$stat_table.' SET
+                        exe_result = exe_result + ' . floatval($questionScore).'
                     WHERE exe_id = ' . $exeId;
             if ($debug) error_log($sql);
             Database::query($sql);
@@ -5121,7 +5121,7 @@ 
      */
     public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -5172,7 +5172,7 @@ 
         $msg = str_replace("#course#", $courseInfo['name'], $msg1);
 
         if ($origin != 'learnpath') {
-            $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
+            $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
         }
         $msg1 = str_replace("#url#", $url_email, $msg);
         $mail_content = $msg1;
@@ -5201,7 +5201,7 @@ 
      */
     function send_notification_for_open_questions($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -5264,11 +5264,11 @@ 
             $msg .= '</table><br />';
 
 
-            $msg1   = str_replace("#exercise#",    $this->exercise, $msg);
-            $msg    = str_replace("#firstName#",   $user_info['firstname'],$msg1);
-            $msg1   = str_replace("#lastName#",    $user_info['lastname'],$msg);
-            $msg    = str_replace("#mail#",        $user_info['email'],$msg1);
-            $msg    = str_replace("#course#",      $course_info['name'],$msg1);
+            $msg1   = str_replace("#exercise#", $this->exercise, $msg);
+            $msg    = str_replace("#firstName#", $user_info['firstname'], $msg1);
+            $msg1   = str_replace("#lastName#", $user_info['lastname'], $msg);
+            $msg    = str_replace("#mail#", $user_info['email'], $msg1);
+            $msg    = str_replace("#course#", $course_info['name'], $msg1);
 
             if ($origin != 'learnpath') {
                 $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
@@ -5297,7 +5297,7 @@ 
 
     function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -5321,7 +5321,7 @@ 
             $answer_type = $item['answer_type'];
 
             if (!empty($question) && !empty($answer) && $answer_type == ORAL_EXPRESSION) {
-                $oral_question_list.='<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">'
+                $oral_question_list .= '<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">'
                     .'<tr>'
                         .'<td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;'.get_lang('Question').'</td>'
                         .'<td width="473" valign="top" bgcolor="#F3F3F3">'.$question.'</td>'
@@ -5354,7 +5354,7 @@ 
                             .'<td>&nbsp;#mail#</td>'
                         .'</tr>'
                     .'</table>';
-            $msg .=  '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'),$oral_question_list).'<br />';
+            $msg .= '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'), $oral_question_list).'<br />';
             $msg1 = str_replace("#exercise#", $this->exercise, $msg);
             $msg = str_replace("#firstName#", $user_info['firstname'], $msg1);
             $msg1 = str_replace("#lastName#", $user_info['lastname'], $msg);
@@ -5362,7 +5362,7 @@ 
             $msg = str_replace("#course#", $course_info['name'], $msg1);
 
             if ($origin != 'learnpath') {
-                $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
+                $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
             }
             $msg1 = str_replace("#url#", $url_email, $msg);
             $mail_content = $msg1;
@@ -5428,10 +5428,10 @@ 
         }
         $html  = '<div class="question-result">';
         $html .= Display::page_header(
-            Display::return_icon('test-quiz.png', get_lang('Result'),null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result')
+            Display::return_icon('test-quiz.png', get_lang('Result'), null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result')
         );
         $html .= Display::description($array);
-        $html .="</div>";
+        $html .= "</div>";
         return $html;
     }
 
@@ -5548,7 +5548,7 @@ 
                     false,
                     $objExercise->selectPropagateNeg()
                 );
-                $totalScore      += $question_result['score'];
+                $totalScore += $question_result['score'];
             }
 
             if ($objExercise->selectPropagateNeg() == 0 && $totalScore < 0) {
@@ -5754,7 +5754,7 @@ 
         }
 
         $rawMessage = "";
-        if (!empty($message)){
+        if (!empty($message)) {
             $rawMessage = $message;
             $message = Display::return_message($message, 'warning', false);
         }
@@ -5770,7 +5770,7 @@ 
     {
         $TBL_LP_ITEM = Database::get_course_table(TABLE_LP_ITEM);
         $sql = "SELECT max_score FROM $TBL_LP_ITEM
-            WHERE c_id = {$this->course_id} AND item_type = '" . TOOL_QUIZ . "' AND path = '{$this->id}'";
+            WHERE c_id = {$this->course_id} AND item_type = '".TOOL_QUIZ."' AND path = '{$this->id}'";
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return true;
@@ -5797,7 +5797,7 @@ 
      */
     private function setMediaList($questionList)
     {
-        $mediaList= array();
+        $mediaList = array();
         if (!empty($questionList)) {
             foreach ($questionList as $questionId) {
                 $objQuestionTmp = Question::read($questionId);
@@ -6098,7 +6098,7 @@ 
         $sql_track = "SELECT * FROM $track_exercises WHERE exe_id = $exe_id ";
         $result = Database::query($sql_track);
         $new_array = array();
-        if (Database::num_rows($result) > 0 ) {
+        if (Database::num_rows($result) > 0) {
             $new_array = Database::fetch_array($result, 'ASSOC');
 
             $new_array['duration'] = null;
@@ -6110,11 +6110,11 @@ 
                 $start_date = api_strtotime($start_date, 'UTC');
                 $end_date = api_strtotime($end_date, 'UTC');
                 if ($start_date && $end_date) {
-                    $mytime = $end_date- $start_date;
+                    $mytime = $end_date - $start_date;
                     $new_learnpath_item = new learnpathItem(null);
                     $time_attemp = $new_learnpath_item->get_scorm_time('js', $mytime);
                     $h = get_lang('h');
-                    $time_attemp = str_replace('NaN', '00' . $h . '00\'00"', $time_attemp);
+                    $time_attemp = str_replace('NaN', '00'.$h.'00\'00"', $time_attemp);
                     $new_array['duration'] = $time_attemp;
                 }
             }
@@ -6136,7 +6136,7 @@ 
                     $result = Database::query($sql);
                 }
             } else {
-                $remind_list = explode(',',$exercise_info['questions_to_check']);
+                $remind_list = explode(',', $exercise_info['questions_to_check']);
 
                 $remind_list_string = '';
                 if ($action == 'add') {
@@ -6148,7 +6148,7 @@ 
                         }
                         $remind_list_string = implode(',', $remind_list);
                     }
-                } elseif ($action == 'delete')  {
+                } elseif ($action == 'delete') {
                     if (!empty($remind_list)) {
                         if (in_array($question_id, $remind_list)) {
                             $remind_list = array_flip($remind_list);
@@ -6390,7 +6390,7 @@ 
                     true
                 );
 
-                $counter += count($mediaQuestions[$questionId]) - 1 ;
+                $counter += count($mediaQuestions[$questionId]) - 1;
                 $before = count($questionList);
                 $wasMedia = true;
                 $nextValue += count($questionList);
@@ -6469,7 +6469,7 @@ 
                         // If it was already seen, then merge the previous with
                         // the current category
                         $oldQuestionList = $newCategoryList[$rootElement]['question_list'];
-                        $category['question_list'] = array_merge($oldQuestionList , $category['question_list']);
+                        $category['question_list'] = array_merge($oldQuestionList, $category['question_list']);
                         $newCategoryList[$rootElement] = $category;
                     }
                 }
@@ -6495,7 +6495,7 @@ 
 
                 if ($useRootAsCategoryTitle) {
                     if (isset($category['parent_info'])) {
-                        $categoryName  = $category['parent_info']['title'];
+                        $categoryName = $category['parent_info']['title'];
                     }
                 }
                 $html .= '<div class="row">';
@@ -6638,7 +6638,7 @@ 
         // end foreach()
 
         if ($this->type == ALL_ON_ONE_PAGE) {
-            $exercise_actions =  $this->show_button($questionId, $currentQuestion);
+            $exercise_actions = $this->show_button($questionId, $currentQuestion);
             echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
         }
     }
@@ -6724,7 +6724,7 @@ 
 
             // Showing the question
 
-            $exercise_actions  = null;
+            $exercise_actions = null;
 
             echo '<a id="questionanchor'.$questionId.'"></a><br />';
             echo '<div id="question_div_'.$questionId.'" class="main_question '.$remind_highlight.'" >';
@@ -6992,7 +6992,7 @@ 
                         $header .= Display::tag('th', get_lang('Feedback'));
                     }
                     $s .= '<table class="data_table">';
-                    $s.= Display::tag('tr', $header, array('style' => 'text-align:left;'));
+                    $s .= Display::tag('tr', $header, array('style' => 'text-align:left;'));
                 }
             }
 
@@ -7092,7 +7092,7 @@ 
                             $s .= '<td>';
                             $s .= $comment;
                             $s .= '</td>';
-                            $s .='</tr>';
+                            $s .= '</tr>';
                         } else {
                             $s .= $answer_input;
                         }
@@ -7106,7 +7106,7 @@ 
                             }
                         }
 
-                        $s .='<tr>';
+                        $s .= '<tr>';
                         $s .= Display::tag('td', $answer);
 
                         if (!empty($quiz_question_options)) {
@@ -7133,7 +7133,7 @@ 
                             $s .= $comment;
                             $s .= '</td>';
                         }
-                        $s.='</tr>';
+                        $s .= '</tr>';
                     }
 
                 } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
@@ -7162,16 +7162,16 @@ 
                     $answer_input .= '</label>';
 
                     if ($show_comment) {
-                        $s.= '<tr>';
+                        $s .= '<tr>';
                         $s .= '<td>';
-                        $s.= $answer_input;
+                        $s .= $answer_input;
                         $s .= '</td>';
                         $s .= '<td>';
                         $s .= $comment;
                         $s .= '</td>';
-                        $s.= '</tr>';
+                        $s .= '</tr>';
                     } else {
-                        $s.= $answer_input;
+                        $s .= $answer_input;
                     }
                 } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
                     $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
@@ -7184,7 +7184,7 @@ 
                         }
                     }
                     $answer = Security::remove_XSS($answer);
-                    $s .='<tr>';
+                    $s .= '<tr>';
                     $s .= Display::tag('td', $answer);
 
                     foreach ($objQuestionTmp->options as $key => $item) {
@@ -7208,7 +7208,7 @@ 
                         $s .= $comment;
                         $s .= '</td>';
                     }
-                    $s.='</tr>';
+                    $s .= '</tr>';
                 } elseif ($answerType == FILL_IN_BLANKS) {
                     list($answer) = explode('::', $answer);
 
@@ -7242,7 +7242,7 @@ 
                                     $value = str_replace('&nbsp;', '', trim($value[0]));
                                 }
                                 $correct_item = preg_quote($correct_item);
-                                $correct_item = api_preg_replace('|/|', '\/', $correct_item);   // to prevent error if there is a / in the text to find
+                                $correct_item = api_preg_replace('|/|', '\/', $correct_item); // to prevent error if there is a / in the text to find
                                 $answer = api_preg_replace('/'.$correct_item.'/', Display::input('text', "choice[$questionId][]", $value), $answer, 1);
                             }
                             $i++;
@@ -7299,7 +7299,7 @@ 
                         }
 
                         if (!empty($answerCorrect) && !empty($selectedValue)) {
-                            $s.= '<script>
+                            $s .= '<script>
                                 jsPlumb.ready(function() {
                                     jsPlumb.connect({
                                         source: "window_'.$windowId.'",
@@ -7314,14 +7314,14 @@ 
                         }
                         $s .= '</select></div></td>';
 
-                        $s.='<td width="45%" valign="top" >';
+                        $s .= '<td width="45%" valign="top" >';
 
                         if (isset($select_items[$lines_count])) {
-                            $s.= '<div id="window_'.$windowId.'_answer" class="window window_right_question">
+                            $s .= '<div id="window_'.$windowId.'_answer" class="window window_right_question">
                                     <b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'].'
                                   </div>';
                         } else {
-                            $s.='&nbsp;';
+                            $s .= '&nbsp;';
                         }
 
                         $s .= '</td>';
@@ -7335,16 +7335,16 @@ 
                                 $s .= '<tr>
                                       <td colspan="2"></td>
                                       <td valign="top">';
-                                $s.='<b>'.$select_items[$lines_count]['letter'].'.</b>';
+                                $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b>';
                                 $s .= $select_items[$lines_count]['answer'];
-                                $s.="</td>
+                                $s .= "</td>
                                 </tr>";
                                 $lines_count++;
                             } // end while()
                         }  // end if()
                         $matching_correct_answer++;
                     }
-                } elseif ($answerType ==  DRAGGABLE) {
+                } elseif ($answerType == DRAGGABLE) {
                     // matching type, showing suggestions and answers
                     // TODO: replace $answerId by $numAnswer
 
@@ -7387,7 +7387,7 @@ 
                         $s .= '</select>';
 
                         if (!empty($answerCorrect) && !empty($selectedValue)) {
-                            $s.= '<script>
+                            $s .= '<script>
                                 $(function() {
                                     deleteItem($("#'.$questionId.'_'.$selectedValue.'"), $("#drop_'.$windowId.'"));
                                 });
@@ -7396,11 +7396,11 @@ 
 
 
                         if (isset($select_items[$lines_count])) {
-                            $s.= '<div id="window_'.$windowId.'_answer" class="">
+                            $s .= '<div id="window_'.$windowId.'_answer" class="">
                                     <b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'].'
                                   </div>';
                         } else {
-                            $s.='&nbsp;';
+                            $s .= '&nbsp;';
                         }
                         $lines_count++;
                         //if the left side of the "matching" has been completely
@@ -7409,7 +7409,7 @@ 
                         if (($lines_count - 1) == $num_suggestions) {
                             // if it remains answers to shown at the right side
                             while (isset($select_items[$lines_count])) {
-                                $s.='<b>'.$select_items[$lines_count]['letter'].'.</b>';
+                                $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b>';
                                 $s .= $select_items[$lines_count]['answer'];
                                 $lines_count++;
                             }
@@ -7512,9 +7512,9 @@ 
 
             if (!$only_questions) {
                 if ($show_title) {
-                    $html .=  TestCategory::getCategoryNamesForQuestion($objQuestionTmp->id);
-                    $html .=  '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
-                    $html .=  $questionDescription;
+                    $html .= TestCategory::getCategoryNamesForQuestion($objQuestionTmp->id);
+                    $html .= '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
+                    $html .= $questionDescription;
                 } else {
                     $html .= '<div class="media">';
                     $html .= '<div class="pull-left">';
@@ -7530,11 +7530,11 @@ 
                     $html .= '</div>';
                 }
                 //@todo I need to the get the feedback type
-                $html .=  '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />';
-                $html .=  '<table class="exercise_questions">
+                $html .= '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />';
+                $html .= '<table class="exercise_questions">
                            <tr>
                             <td valign="top" colspan="2">';
-                $html .=  '</td></tr>';
+                $html .= '</td></tr>';
             }
 
             $canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');

main/exercice/TestCategory.php

Doc Comments +2 added lines, -3 removed lines

@@ -367,7 +367,7 @@ 
 	 * Return the list of differents categories NAME for a test
 	 * @param int exercise id
 	 * @param bool
-	 * @return array of string
+	 * @return integer of string
 	 *
      * @author function rewrote by jmontoya
 	 */
@@ -983,7 +983,6 @@ 
     /**
      * Return the id of the test category with title = $in_title
      * @param $in_title
-     * @param int $in_c_id
      *
      * @return int is id of test category
      */
@@ -1011,7 +1010,7 @@ 
      * @param int $questionId
      * @param int $courseId
 	 *
-	 * @return int
+	 * @return string|false
      */
     public static function add_category_for_question_id($categoryId, $questionId, $courseId)
     {

Indentation +504 added lines, -504 removed lines

@@ -13,11 +13,11 @@ 
     public $name;
     public $description;
 
-	/**
-	 * Constructor of the class Category
-	 * If you give an in_id and no in_name, you get info concerning the category of id=in_id
-	 * otherwise, you've got an category objet avec your in_id, in_name, in_descr
-	 *
+    /**
+     * Constructor of the class Category
+     * If you give an in_id and no in_name, you get info concerning the category of id=in_id
+     * otherwise, you've got an category objet avec your in_id, in_name, in_descr
+     *
      * @param int    $id
      * @param string $name
      * @param string $description
@@ -61,9 +61,9 @@ 
         }
     }
 
-	/**
+    /**
      * add TestCategory in the database if name doesn't already exists
-	 */
+     */
     public function addCategoryInBDD()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -108,12 +108,12 @@ 
 
             return false;
         }
-	}
+    }
 
-	/**
+    /**
      * Removes the category from the database
      * if there were question in this category, the link between question and category is removed
-	 */
+     */
     public function removeCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -143,11 +143,11 @@ 
 
             return true;
         }
-	}
+    }
 
-	/**
+    /**
      * Modify category name or description of category with id=in_id
-	 */
+     */
     public function modifyCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -175,40 +175,40 @@ 
 
             return true;
         }
-	}
+    }
 
-	/**
+    /**
      * Gets the number of question of category id=in_id
-	 */
+     */
     public function getCategoryQuestionsNumber()
     {
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
-		$in_id = intval($this->id);
-		$sql = "SELECT count(*) AS nb
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $in_id = intval($this->id);
+        $sql = "SELECT count(*) AS nb
 		        FROM $table
 		        WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
-		$res = Database::query($sql);
-		$row = Database::fetch_array($res);
+        $res = Database::query($sql);
+        $row = Database::fetch_array($res);
 
-		return $row['nb'];
-	}
+        return $row['nb'];
+    }
 
     /**
      * @param string $in_color
      */
     public function display($in_color="#E0EBF5")
     {
-		echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
-		print_r($this);
-		echo "</textarea>";
-	}
+        echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
+        print_r($this);
+        echo "</textarea>";
+    }
 
-	/**
+    /**
      * Return an array of all Category objects in the database
-	 * If in_field=="" Return an array of all category objects in the database
-	 * Otherwise, return an array of all in_field value
-	 * in the database (in_field = id or name or description)
-	 */
+     * If in_field=="" Return an array of all category objects in the database
+     * Otherwise, return an array of all in_field value
+     * in the database (in_field = id or name or description)
+     */
     public static function getCategoryListInfo($in_field = "", $courseId = "")
     {
         if (empty($courseId) || $courseId=="") {
@@ -239,8 +239,8 @@ 
             }
         }
 
-		return $tabres;
-	}
+        return $tabres;
+    }
 
     /**
      * Return the TestCategory id for question with question_id = $questionId
@@ -251,246 +251,246 @@ 
      *
      * @return int
      */
-	public static function getCategoryForQuestion($questionId, $courseId ="")
+    public static function getCategoryForQuestion($questionId, $courseId ="")
     {
-		$result = 0;
+        $result = 0;
         if (empty($courseId) || $courseId == "") {
             $courseId = api_get_course_int_id();
         }
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
         $questionId = intval($questionId);
-		$sql = "SELECT category_id
+        $sql = "SELECT category_id
 		        FROM $table
 		        WHERE question_id = $questionId AND c_id = $courseId";
-		$res = Database::query($sql);
-		if (Database::num_rows($res) > 0) {
+        $res = Database::query($sql);
+        if (Database::num_rows($res) > 0) {
             $data = Database::fetch_array($res);
-			$result = $data['category_id'];
-		}
+            $result = $data['category_id'];
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * true if question id has a category
-	 */
-	public static function isQuestionHasCategory($questionId)
+    /**
+     * true if question id has a category
+     */
+    public static function isQuestionHasCategory($questionId)
     {
-		if (TestCategory::getCategoryForQuestion($questionId) > 0) {
-			return true;
-		}
-		return false;
-	}
+        if (TestCategory::getCategoryForQuestion($questionId) > 0) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
+    /**
 	 Return the category name for question with question_id = $questionId
 	 In this version, a question has only 1 category.
 	 Return the category id, "" if none
-	 */
+     */
     public static function getCategoryNameForQuestion(
         $questionId,
         $courseId = ""
     ) {
-		if (empty($courseId) || $courseId=="") {
-			$courseId = api_get_course_int_id();
-		}
-		$catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
-		$result = "";	// result
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
-		$catid = intval($catid);
-		$sql = "SELECT title FROM $table
+        if (empty($courseId) || $courseId=="") {
+            $courseId = api_get_course_int_id();
+        }
+        $catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
+        $result = "";	// result
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+        $catid = intval($catid);
+        $sql = "SELECT title FROM $table
 		        WHERE id = $catid  AND c_id = $courseId";
-		$res = Database::query($sql);
-		$data = Database::fetch_array($res);
-		if (Database::num_rows($res) > 0) {
-			$result = $data['title'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Return the list of differents categories ID for a test in the current course
-	 * input : test_id
-	 * return : array of category id (integer)
-	 * hubert.borderiou 07-04-2011
-	 * @param int $exerciseId
-	 */
-	public static function getListOfCategoriesIDForTest($exerciseId)
+        $res = Database::query($sql);
+        $data = Database::fetch_array($res);
+        if (Database::num_rows($res) > 0) {
+            $result = $data['title'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return the list of differents categories ID for a test in the current course
+     * input : test_id
+     * return : array of category id (integer)
+     * hubert.borderiou 07-04-2011
+     * @param int $exerciseId
+     */
+    public static function getListOfCategoriesIDForTest($exerciseId)
     {
-		// parcourir les questions d'un test, recup les categories uniques dans un tableau
-		$exercise = new Exercise();
-		$exercise->read($exerciseId, false);
-		$categoriesInExercise = $exercise->getQuestionWithCategories();
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
-		$categories = array();
+        // parcourir les questions d'un test, recup les categories uniques dans un tableau
+        $exercise = new Exercise();
+        $exercise->read($exerciseId, false);
+        $categoriesInExercise = $exercise->getQuestionWithCategories();
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
+        $categories = array();
         if (!empty($categoriesInExercise)) {
-			foreach ($categoriesInExercise as $category) {
-				//$category['id'] = $category['iid'];
-				$categories[$category['id']] = $category;
-			}
-		}
-
-		return $categories;
-	}
-
-	/**
-	 * @param Exercise $exercise_obj
-	 * @return array
-	 */
-	public static function getListOfCategoriesIDForTestObject(Exercise $exercise_obj)
-	{
-		// parcourir les questions d'un test, recup les categories uniques dans un tableau
-		$categories_in_exercise = array();
-		// $question_list = $exercise_obj->getQuestionList();
-		$question_list = $exercise_obj->getQuestionOrderedListByName();
-
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
-		foreach ($question_list as $questionInfo) {
-			$question_id = $questionInfo['question_id'];
-			$category_list = self::getCategoryForQuestion($question_id);
-			if (is_numeric($category_list)) {
-				$category_list = array($category_list);
-			}
-
-			if (!empty($category_list)) {
-				$categories_in_exercise = array_merge($categories_in_exercise, $category_list);
-			}
-		}
-		if (!empty($categories_in_exercise)) {
-			$categories_in_exercise = array_unique(array_filter($categories_in_exercise));
-		}
-		return $categories_in_exercise;
-	}
-
-	/**
-	 * Return the list of differents categories NAME for a test
-	 * @param int exercise id
-	 * @param bool
-	 * @return array of string
-	 *
+            foreach ($categoriesInExercise as $category) {
+                //$category['id'] = $category['iid'];
+                $categories[$category['id']] = $category;
+            }
+        }
+
+        return $categories;
+    }
+
+    /**
+     * @param Exercise $exercise_obj
+     * @return array
+     */
+    public static function getListOfCategoriesIDForTestObject(Exercise $exercise_obj)
+    {
+        // parcourir les questions d'un test, recup les categories uniques dans un tableau
+        $categories_in_exercise = array();
+        // $question_list = $exercise_obj->getQuestionList();
+        $question_list = $exercise_obj->getQuestionOrderedListByName();
+
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
+        foreach ($question_list as $questionInfo) {
+            $question_id = $questionInfo['question_id'];
+            $category_list = self::getCategoryForQuestion($question_id);
+            if (is_numeric($category_list)) {
+                $category_list = array($category_list);
+            }
+
+            if (!empty($category_list)) {
+                $categories_in_exercise = array_merge($categories_in_exercise, $category_list);
+            }
+        }
+        if (!empty($categories_in_exercise)) {
+            $categories_in_exercise = array_unique(array_filter($categories_in_exercise));
+        }
+        return $categories_in_exercise;
+    }
+
+    /**
+     * Return the list of differents categories NAME for a test
+     * @param int exercise id
+     * @param bool
+     * @return array of string
+     *
      * @author function rewrote by jmontoya
-	 */
-	public static function getListOfCategoriesNameForTest($exercise_id, $grouped_by_category = true)
+     */
+    public static function getListOfCategoriesNameForTest($exercise_id, $grouped_by_category = true)
     {
-		$result = array();
-		$categories = self::getListOfCategoriesIDForTest($exercise_id, $grouped_by_category);
+        $result = array();
+        $categories = self::getListOfCategoriesIDForTest($exercise_id, $grouped_by_category);
 
-		foreach ($categories as $catInfo) {
-			$categoryId = $catInfo['id'];
-			if (!empty($categoryId)) {
-				$result[$categoryId] = array(
+        foreach ($categories as $catInfo) {
+            $categoryId = $catInfo['id'];
+            if (!empty($categoryId)) {
+                $result[$categoryId] = array(
                     'title' => $catInfo['title'],
                     //'parent_id' =>  $catInfo['parent_id'],
-					'parent_id' => '',
+                    'parent_id' => '',
                     'c_id' => $catInfo['c_id']
                 );
-		}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param Exercise $exercise_obj
-	 * @return array
-	 */
-	public static function getListOfCategoriesForTest(Exercise $exercise_obj)
-	{
-		$result = array();
-		$categories = self::getListOfCategoriesIDForTestObject($exercise_obj);
-		foreach ($categories as $cat_id) {
-			$cat = new TestCategory($cat_id);
-			$cat = (array)$cat;
-			$cat['iid'] = $cat['id'];
-			$cat['title'] = $cat['name'];
-			$result[$cat['id']] = $cat;
-		}
-		return $result;
-	}
-
-	/**
-	 * return the number of differents categories for a test
-	 * input : test_id
-	 * return : integer
-	 * hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfCategoriesForTest($id)
+        }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Exercise $exercise_obj
+     * @return array
+     */
+    public static function getListOfCategoriesForTest(Exercise $exercise_obj)
+    {
+        $result = array();
+        $categories = self::getListOfCategoriesIDForTestObject($exercise_obj);
+        foreach ($categories as $cat_id) {
+            $cat = new TestCategory($cat_id);
+            $cat = (array)$cat;
+            $cat['iid'] = $cat['id'];
+            $cat['title'] = $cat['name'];
+            $result[$cat['id']] = $cat;
+        }
+        return $result;
+    }
+
+    /**
+     * return the number of differents categories for a test
+     * input : test_id
+     * return : integer
+     * hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfCategoriesForTest($id)
     {
-		return count(TestCategory::getListOfCategoriesIDForTest($id));
-	}
+        return count(TestCategory::getListOfCategoriesIDForTest($id));
+    }
 
-	/**
-	 * return the number of question of a category id in a test
-	 * @param int $exerciseId
+    /**
+     * return the number of question of a category id in a test
+     * @param int $exerciseId
      * @param int $categoryId
      *
-	 * @return integer
+     * @return integer
      *
-	 * @author hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
+     * @author hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
     {
-		$nbCatResult = 0;
-		$quiz = new Exercise();
-		$quiz->read($exerciseId);
-		$tabQuestionList = $quiz->selectQuestionList();
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
-		for ($i=1; $i <= count($tabQuestionList); $i++) {
-			if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
-				$nbCatResult++;
-			}
-		}
-
-		return $nbCatResult;
-	}
-
-	/**
-	 * return the number of question for a test using random by category
-	 * input  : test_id, number of random question (min 1)
-	 * hubert.borderiou 07-04-2011
-	 * question without categories are not counted
-	 */
-	public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
+        $nbCatResult = 0;
+        $quiz = new Exercise();
+        $quiz->read($exerciseId);
+        $tabQuestionList = $quiz->selectQuestionList();
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
+        for ($i=1; $i <= count($tabQuestionList); $i++) {
+            if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
+                $nbCatResult++;
+            }
+        }
+
+        return $nbCatResult;
+    }
+
+    /**
+     * return the number of question for a test using random by category
+     * input  : test_id, number of random question (min 1)
+     * hubert.borderiou 07-04-2011
+     * question without categories are not counted
+     */
+    public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
     {
-		$nbquestionresult = 0;
-		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0 && $tabcatid[$i] > 0) {	// 0 = no category for this questio
-				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
-				if ($nbQuestionInThisCat > $in_nbrandom) {
-					$nbquestionresult += $in_nbrandom;
-				}
-				else {
-					$nbquestionresult += $nbQuestionInThisCat;
-				}
-			}
-		}
-
-		return $nbquestionresult;
-	}
-
-	/**
-	 * Return an array (id=>name)
-	 * tabresult[0] = get_lang('NoCategory');
+        $nbquestionresult = 0;
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        for ($i=0; $i < count($tabcatid); $i++) {
+            if ($tabcatid[$i] > 0 && $tabcatid[$i] > 0) {	// 0 = no category for this questio
+                $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
+                if ($nbQuestionInThisCat > $in_nbrandom) {
+                    $nbquestionresult += $in_nbrandom;
+                }
+                else {
+                    $nbquestionresult += $nbQuestionInThisCat;
+                }
+            }
+        }
+
+        return $nbquestionresult;
+    }
+
+    /**
+     * Return an array (id=>name)
+     * tabresult[0] = get_lang('NoCategory');
      *
      * @param int $courseId
      *
      * @return array
-	 *
-	 */
+     *
+     */
     public static function getCategoriesIdAndName($courseId = "")
     {
-		if (empty($courseId)) {
-			$courseId = api_get_course_int_id();
-		}
-	 	$tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
-	 	$tabresult = array("0"=>get_lang('NoCategorySelected'));
-	 	for ($i=0; $i < count($tabcatobject); $i++) {
-	 		$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
-	 	}
-	 	return $tabresult;
-	}
+        if (empty($courseId)) {
+            $courseId = api_get_course_int_id();
+        }
+            $tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
+            $tabresult = array("0"=>get_lang('NoCategorySelected'));
+            for ($i=0; $i < count($tabcatobject); $i++) {
+                $tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
+            }
+            return $tabresult;
+    }
 
     /**
      * Returns an array of question ids for each category
@@ -499,10 +499,10 @@ 
      * @param int exercise
      * @param array $check_in_question_list
      * @param array $categoriesAddedInExercise
-    *
-    * @param int $exerciseId
-    * @return array
-    */
+     *
+     * @param int $exerciseId
+     * @return array
+     */
     static function getQuestionsByCat(
         $exerciseId,
         $check_in_question_list = array(),
@@ -580,28 +580,28 @@ 
         }
 
         return $categories;
-	}
+    }
 
-	/**
-	 * return a tab of $in_number random elements of $in_tab
-	 */
+    /**
+     * return a tab of $in_number random elements of $in_tab
+     */
     public static function getNElementsFromArray($in_tab, $in_number)
     {
-		$tabres = $in_tab;
-		shuffle($tabres);
-		if ($in_number < count($tabres)) {
-			$tabres = array_slice($tabres, 0, $in_number);
-		}
-		return $tabres;
-	}
-
-	/**
-	 * display the category
-	 */
-	public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
+        $tabres = $in_tab;
+        shuffle($tabres);
+        if ($in_number < count($tabres)) {
+            $tabres = array_slice($tabres, 0, $in_number);
+        }
+        return $tabres;
+    }
+
+    /**
+     * display the category
+     */
+    public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
     {
         echo self::returnCategoryAndTitle($questionId, $in_display_category_name);
-	}
+    }
 
     /**
      * @param int $questionId
@@ -617,98 +617,98 @@ 
             $in_display_category_name = $objExercise->display_category_name;
         }
         $content = null;
-		if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
+        if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
             $content .= '<div class="page-header">';
             $content .= '<h4>'.get_lang('Category').": ".TestCategory::getCategoryNameForQuestion($questionId).'</h4>';
             $content .= "</div>";
-		}
+        }
         return $content;
-	}
+    }
 
     /**
-    * Display signs [+] and/or (>0) after question title if question has options
-    * scoreAlwaysPositive and/or uncheckedMayScore
-    */
+     * Display signs [+] and/or (>0) after question title if question has options
+     * scoreAlwaysPositive and/or uncheckedMayScore
+     */
     public function displayQuestionOption($in_objQuestion)
     {
-		if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
-			echo "<span style='font-size:75%'> (>0)</span>";
-		}
-		if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->uncheckedMayScore) {
-			echo "<span style='font-size:75%'> [+]</span>";
-		}
-	}
-
-	/**
-	 * sortTabByBracketLabel ($tabCategoryQuestions)
-	 * key of $tabCategoryQuestions are the category id (0 for not in a category)
-	 * value is the array of question id of this category
-	 * Sort question by Category
-	*/
+        if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
+            echo "<span style='font-size:75%'> (>0)</span>";
+        }
+        if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->uncheckedMayScore) {
+            echo "<span style='font-size:75%'> [+]</span>";
+        }
+    }
+
+    /**
+     * sortTabByBracketLabel ($tabCategoryQuestions)
+     * key of $tabCategoryQuestions are the category id (0 for not in a category)
+     * value is the array of question id of this category
+     * Sort question by Category
+     */
     public static function sortTabByBracketLabel($in_tab)
     {
-		$tabResult = array();
-		$tabCatName = array();	// tab of category name
-		while (list($cat_id, $tabquestion) = each($in_tab)) {
-			$catTitle = new TestCategory($cat_id);
-			$tabCatName[$cat_id] = $catTitle->name;
-		}
-		reset($in_tab);
-		// sort table by value, keeping keys as they are
-		asort($tabCatName);
-		// keys of $tabCatName are keys order for $in_tab
-		while (list($key, $val) = each($tabCatName)) {
-			$tabResult[$key] = $in_tab[$key];
-		}
-		return $tabResult;
-	}
+        $tabResult = array();
+        $tabCatName = array();	// tab of category name
+        while (list($cat_id, $tabquestion) = each($in_tab)) {
+            $catTitle = new TestCategory($cat_id);
+            $tabCatName[$cat_id] = $catTitle->name;
+        }
+        reset($in_tab);
+        // sort table by value, keeping keys as they are
+        asort($tabCatName);
+        // keys of $tabCatName are keys order for $in_tab
+        while (list($key, $val) = each($tabCatName)) {
+            $tabResult[$key] = $in_tab[$key];
+        }
+        return $tabResult;
+    }
 
     /**
-	 * return total score for test exe_id for all question in the category $in_cat_id for user
-	 * If no question for this category, return ""
-	 */
-	public static function getCatScoreForExeidForUserid($in_cat_id, $in_exe_id, $in_user_id)
-	{
-		$tbl_track_attempt		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-		$tbl_question_rel_category = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
-		$in_cat_id = intval($in_cat_id);
-		$in_exe_id = intval($in_exe_id);
-		$in_user_id = intval($in_user_id);
-
-		$query = "SELECT DISTINCT
+     * return total score for test exe_id for all question in the category $in_cat_id for user
+     * If no question for this category, return ""
+     */
+    public static function getCatScoreForExeidForUserid($in_cat_id, $in_exe_id, $in_user_id)
+    {
+        $tbl_track_attempt		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tbl_question_rel_category = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $in_cat_id = intval($in_cat_id);
+        $in_exe_id = intval($in_exe_id);
+        $in_user_id = intval($in_user_id);
+
+        $query = "SELECT DISTINCT
 		            marks, exe_id, user_id, ta.question_id, category_id
                   FROM $tbl_track_attempt ta , $tbl_question_rel_category qrc
                   WHERE
                     ta.question_id=qrc.question_id AND
                     qrc.category_id=$in_cat_id AND
                     exe_id=$in_exe_id AND user_id=$in_user_id";
-		$res = Database::query($query);
-		$totalcatscore = "";
-		while ($data = Database::fetch_array($res)) {
-			$totalcatscore += $data['marks'];
-		}
-		return $totalcatscore;
-	}
-
-	/**
+        $res = Database::query($query);
+        $totalcatscore = "";
+        while ($data = Database::fetch_array($res)) {
+            $totalcatscore += $data['marks'];
+        }
+        return $totalcatscore;
+    }
+
+    /**
      * return the number max of question in a category
      * count the number of questions in all categories, and return the max
      * @param int $exerciseId
      * @author - hubert borderiou
-    */
+     */
     public static function getNumberMaxQuestionByCat($exerciseId)
     {
         $res_num_max = 0;
         // foreach question
-		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0) {	// 0 = no category for this question
-				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        for ($i=0; $i < count($tabcatid); $i++) {
+            if ($tabcatid[$i] > 0) {	// 0 = no category for this question
+                $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
                 if ($nbQuestionInThisCat > $res_num_max) {
                     $res_num_max = $nbQuestionInThisCat;
                 }
-			}
-		}
+            }
+        }
         return $res_num_max;
     }
 
@@ -768,34 +768,34 @@ 
     }
 
     /**
-	 * @return array
-	 */
-	function get_all_categories()
-	{
-		$table = Database::get_course_table(TABLE_QUIZ_CATEGORY);
-		$sql = "SELECT * FROM $table ORDER BY title ASC";
-		$res = Database::query($sql);
-		while ($row = Database::fetch_array($res,'ASSOC')) {
-			$array[] = $row;
-		}
-		return $array;
-	}
-
-	/**
-	 * @param Exercise $exercise
-	 * @param int $course_id
-	 * @param string $order
-	 * @param bool $shuffle
-	 * @param bool $excludeCategoryWithNoQuestions
-	 * @return array|bool
-	 */
-	public function getCategoryExerciseTree(
-		$exercise,
-		$course_id,
-		$order = null,
-		$shuffle = false,
-		$excludeCategoryWithNoQuestions = true
-	) {
+     * @return array
+     */
+    function get_all_categories()
+    {
+        $table = Database::get_course_table(TABLE_QUIZ_CATEGORY);
+        $sql = "SELECT * FROM $table ORDER BY title ASC";
+        $res = Database::query($sql);
+        while ($row = Database::fetch_array($res,'ASSOC')) {
+            $array[] = $row;
+        }
+        return $array;
+    }
+
+    /**
+     * @param Exercise $exercise
+     * @param int $course_id
+     * @param string $order
+     * @param bool $shuffle
+     * @param bool $excludeCategoryWithNoQuestions
+     * @return array|bool
+     */
+    public function getCategoryExerciseTree(
+        $exercise,
+        $course_id,
+        $order = null,
+        $shuffle = false,
+        $excludeCategoryWithNoQuestions = true
+    ) {
         if (empty($exercise)) {
             return array();
         }
@@ -805,165 +805,165 @@ 
         }
 
         $course_id = intval($course_id);
-		$table = Database::get_course_table(TABLE_QUIZ_REL_CATEGORY);
+        $table = Database::get_course_table(TABLE_QUIZ_REL_CATEGORY);
         $categoryTable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
-		$sql = "SELECT * FROM $table qc
+        $sql = "SELECT * FROM $table qc
               	LEFT JOIN $categoryTable c
                 ON (qc.c_id = c.c_id AND c.id = qc.category_id)
                 WHERE qc.c_id = $course_id AND exercise_id = {$exercise->id} ";
 
-		if (!empty($order)) {
-			$sql .= "ORDER BY $order";
-		}
-
-		$categories = array();
-
-		$result = Database::query($sql);
-		if (Database::num_rows($result)) {
-			while ($row = Database::fetch_array($result, 'ASSOC')) {
-				if ($excludeCategoryWithNoQuestions) {
-					if ($row['count_questions'] == 0) {
-						continue;
-					}
-				}
-				if (empty($row['title']) && empty($row['category_id'])) {
-					$row['title'] = get_lang('NoCategory');
-				}
+        if (!empty($order)) {
+            $sql .= "ORDER BY $order";
+        }
+
+        $categories = array();
+
+        $result = Database::query($sql);
+        if (Database::num_rows($result)) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
+                if ($excludeCategoryWithNoQuestions) {
+                    if ($row['count_questions'] == 0) {
+                        continue;
+                    }
+                }
+                if (empty($row['title']) && empty($row['category_id'])) {
+                    $row['title'] = get_lang('NoCategory');
+                }
                 $categories[$row['category_id']] = $row;
-			}
-		}
-
-		if ($shuffle) {
-			shuffle_assoc($categories);
-		}
-
-		return $categories;
-	}
-
-	public function getForm(& $form, $action = 'new')
-	{
-		switch($action) {
-			case 'new':
-				$header = get_lang('AddACategory');
-				$submit = get_lang('AddTestCategory');
-				break;
-			case 'edit':
-				$header = get_lang('EditCategory');
-				$submit = get_lang('ModifyCategory');
-				break;
-		}
-
-		// settting the form elements
-		$form->addElement('header', $header);
-		$form->addElement('hidden', 'category_id');
-		$form->addElement('text', 'category_name', get_lang('CategoryName'), array('class' => 'span6'));
-		$form->add_html_editor('category_description', get_lang('CategoryDescription'), false, false, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200'));
-		$category_parent_list = array();
-
-		$options = array(
-				'1' => get_lang('Visible'),
-				'0' => get_lang('Hidden')
-		);
-		$form->addElement('select', 'visibility', get_lang('Visibility'), $options);
-		$script = null;
-		if (!empty($this->parent_id)) {
-			$parent_cat = new TestCategory($this->parent_id);
-			$category_parent_list = array($parent_cat->id => $parent_cat->name);
-			$script .= '<script>$(function() { $("#parent_id").trigger("addItem",[{"title": "'.$parent_cat->name.'", "value": "'.$parent_cat->id.'"}]); });</script>';
-		}
-		$form->addElement('html', $script);
-
-		$form->addElement('select', 'parent_id', get_lang('Parent'), $category_parent_list, array('id' => 'parent_id'));
-		$form->addElement('style_submit_button', 'SubmitNote', $submit, 'class="add"');
-
-		// setting the defaults
-		$defaults = array();
-		$defaults["category_id"] = $this->id;
-		$defaults["category_name"] = $this->name;
-		$defaults["category_description"] = $this->description;
-		$defaults["parent_id"] = $this->parent_id;
-		$defaults["visibility"] = $this->visibility;
-		$form->setDefaults($defaults);
-
-		// setting the rules
-		$form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
-	}
-
-	/**
-	 * Returns the category form.
-	 * @param Exercise $exercise_obj
-	 * @return string
-	 */
-	public function returnCategoryForm(Exercise $exercise_obj)
-	{
-		$categories = $this->getListOfCategoriesForTest($exercise_obj);
-
-		$saved_categories = $exercise_obj->get_categories_in_exercise();
-		$return = null;
-
-		if (!empty($categories)) {
-			$nbQuestionsTotal = $exercise_obj->getNumberQuestionExerciseCategory();
-			$exercise_obj->setCategoriesGrouping(true);
-			$real_question_count = count($exercise_obj->getQuestionList());
-
-			$warning = null;
-			if ($nbQuestionsTotal != $real_question_count) {
-				$warning = Display::return_message(get_lang('CheckThatYouHaveEnoughQuestionsInYourCategories'), 'warning');
-			}
-
-			$return .= $warning;
-			$return .= '<table class="data_table">';
-			$return .= '<tr>';
-			$return .= '<th height="24">' . get_lang('Categories') . '</th>';
-			$return .= '<th width="70" height="24">' . get_lang('Number') . '</th></tr>';
-
-			$emptyCategory = array(
-				'id' => '0',
-				'name' => get_lang('NoCategory'),
-				'description' => '',
-				'iid' => '0',
-				'title' => get_lang('NoCategory')
-			);
-
-			$categories[] = $emptyCategory;
-
-			foreach ($categories as $category) {
-				$cat_id = $category['iid'];
-				$return .= '<tr>';
-				$return .= '<td>';
-				//$return .= Display::div(isset($category['parent_path']) ? $category['parent_path'] : '');
-				$return .= Display::div($category['name']);
-				$return .= '</td>';
-				$return .= '<td>';
-				$value = isset($saved_categories) && isset($saved_categories[$cat_id]) ? $saved_categories[$cat_id]['count_questions'] : -1;
-				$return .= '<input name="category['.$cat_id.']" value="' .$value.'" />';
-				$return .= '</td>';
-				$return .= '</tr>';
-			}
-
-			$return .= '</table>';
-			$return .= get_lang('ZeroMeansNoQuestionWillBeSelectedMinusOneMeansThatAllQuestionsWillBeSelected');
-			return $return;
-		}
-	}
-
-	/**
-	 * Sorts an array
-	 * @param $array
-	 * @return mixed
-	 */
-	public function sort_tree_array($array)
-	{
-		foreach ($array as $key => $row) {
-			$parent[$key] = $row['parent_id'];
-		}
-		if (count($array) > 0) {
-			array_multisort($parent, SORT_ASC, $array);
-		}
-		return $array;
-	}
-
-	/**
+            }
+        }
+
+        if ($shuffle) {
+            shuffle_assoc($categories);
+        }
+
+        return $categories;
+    }
+
+    public function getForm(& $form, $action = 'new')
+    {
+        switch($action) {
+            case 'new':
+                $header = get_lang('AddACategory');
+                $submit = get_lang('AddTestCategory');
+                break;
+            case 'edit':
+                $header = get_lang('EditCategory');
+                $submit = get_lang('ModifyCategory');
+                break;
+        }
+
+        // settting the form elements
+        $form->addElement('header', $header);
+        $form->addElement('hidden', 'category_id');
+        $form->addElement('text', 'category_name', get_lang('CategoryName'), array('class' => 'span6'));
+        $form->add_html_editor('category_description', get_lang('CategoryDescription'), false, false, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200'));
+        $category_parent_list = array();
+
+        $options = array(
+                '1' => get_lang('Visible'),
+                '0' => get_lang('Hidden')
+        );
+        $form->addElement('select', 'visibility', get_lang('Visibility'), $options);
+        $script = null;
+        if (!empty($this->parent_id)) {
+            $parent_cat = new TestCategory($this->parent_id);
+            $category_parent_list = array($parent_cat->id => $parent_cat->name);
+            $script .= '<script>$(function() { $("#parent_id").trigger("addItem",[{"title": "'.$parent_cat->name.'", "value": "'.$parent_cat->id.'"}]); });</script>';
+        }
+        $form->addElement('html', $script);
+
+        $form->addElement('select', 'parent_id', get_lang('Parent'), $category_parent_list, array('id' => 'parent_id'));
+        $form->addElement('style_submit_button', 'SubmitNote', $submit, 'class="add"');
+
+        // setting the defaults
+        $defaults = array();
+        $defaults["category_id"] = $this->id;
+        $defaults["category_name"] = $this->name;
+        $defaults["category_description"] = $this->description;
+        $defaults["parent_id"] = $this->parent_id;
+        $defaults["visibility"] = $this->visibility;
+        $form->setDefaults($defaults);
+
+        // setting the rules
+        $form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
+    }
+
+    /**
+     * Returns the category form.
+     * @param Exercise $exercise_obj
+     * @return string
+     */
+    public function returnCategoryForm(Exercise $exercise_obj)
+    {
+        $categories = $this->getListOfCategoriesForTest($exercise_obj);
+
+        $saved_categories = $exercise_obj->get_categories_in_exercise();
+        $return = null;
+
+        if (!empty($categories)) {
+            $nbQuestionsTotal = $exercise_obj->getNumberQuestionExerciseCategory();
+            $exercise_obj->setCategoriesGrouping(true);
+            $real_question_count = count($exercise_obj->getQuestionList());
+
+            $warning = null;
+            if ($nbQuestionsTotal != $real_question_count) {
+                $warning = Display::return_message(get_lang('CheckThatYouHaveEnoughQuestionsInYourCategories'), 'warning');
+            }
+
+            $return .= $warning;
+            $return .= '<table class="data_table">';
+            $return .= '<tr>';
+            $return .= '<th height="24">' . get_lang('Categories') . '</th>';
+            $return .= '<th width="70" height="24">' . get_lang('Number') . '</th></tr>';
+
+            $emptyCategory = array(
+                'id' => '0',
+                'name' => get_lang('NoCategory'),
+                'description' => '',
+                'iid' => '0',
+                'title' => get_lang('NoCategory')
+            );
+
+            $categories[] = $emptyCategory;
+
+            foreach ($categories as $category) {
+                $cat_id = $category['iid'];
+                $return .= '<tr>';
+                $return .= '<td>';
+                //$return .= Display::div(isset($category['parent_path']) ? $category['parent_path'] : '');
+                $return .= Display::div($category['name']);
+                $return .= '</td>';
+                $return .= '<td>';
+                $value = isset($saved_categories) && isset($saved_categories[$cat_id]) ? $saved_categories[$cat_id]['count_questions'] : -1;
+                $return .= '<input name="category['.$cat_id.']" value="' .$value.'" />';
+                $return .= '</td>';
+                $return .= '</tr>';
+            }
+
+            $return .= '</table>';
+            $return .= get_lang('ZeroMeansNoQuestionWillBeSelectedMinusOneMeansThatAllQuestionsWillBeSelected');
+            return $return;
+        }
+    }
+
+    /**
+     * Sorts an array
+     * @param $array
+     * @return mixed
+     */
+    public function sort_tree_array($array)
+    {
+        foreach ($array as $key => $row) {
+            $parent[$key] = $row['parent_id'];
+        }
+        if (count($array) > 0) {
+            array_multisort($parent, SORT_ASC, $array);
+        }
+        return $array;
+    }
+
+    /**
      * Return true if a category already exists with the same name
      * @param string $in_name
      *
@@ -1010,8 +1010,8 @@ 
      * @param int $categoryId
      * @param int $questionId
      * @param int $courseId
-	 *
-	 * @return int
+     *
+     * @return int
      */
     public static function add_category_for_question_id($categoryId, $questionId, $courseId)
     {
@@ -1019,18 +1019,18 @@ 
         // if question doesn't have a category
         // @todo change for 1.10 when a question can have several categories
         if (TestCategory::getCategoryForQuestion($questionId, $courseId) == 0 &&
-			$questionId > 0 &&
-			$courseId > 0
+            $questionId > 0 &&
+            $courseId > 0
         ) {
             $sql = "INSERT INTO $table (c_id, question_id, category_id)
                     VALUES (".intval($courseId).", ".intval($questionId).", ".intval($categoryId).")";
             Database::query($sql);
-			$id = Database::insert_id();
+            $id = Database::insert_id();
 
-			return $id;
+            return $id;
         }
 
-		return false;
+        return false;
     }
 
     /**

Spacing +26 added lines, -26 removed lines

@@ -57,7 +57,7 @@ 
             $row = Database::fetch_array($res);
             $this->id = $row['id'];
             $this->name = $row['title'];
-            $this->description  = $row['description'];
+            $this->description = $row['description'];
         }
     }
 
@@ -196,7 +196,7 @@ 
     /**
      * @param string $in_color
      */
-    public function display($in_color="#E0EBF5")
+    public function display($in_color = "#E0EBF5")
     {
 		echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
 		print_r($this);
@@ -211,7 +211,7 @@ 
 	 */
     public static function getCategoryListInfo($in_field = "", $courseId = "")
     {
-        if (empty($courseId) || $courseId=="") {
+        if (empty($courseId) || $courseId == "") {
             $courseId = api_get_course_int_id();
         }
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -251,7 +251,7 @@ 
      *
      * @return int
      */
-	public static function getCategoryForQuestion($questionId, $courseId ="")
+	public static function getCategoryForQuestion($questionId, $courseId = "")
     {
 		$result = 0;
         if (empty($courseId) || $courseId == "") {
@@ -291,11 +291,11 @@ 
         $questionId,
         $courseId = ""
     ) {
-		if (empty($courseId) || $courseId=="") {
+		if (empty($courseId) || $courseId == "") {
 			$courseId = api_get_course_int_id();
 		}
 		$catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
-		$result = "";	// result
+		$result = ""; // result
 		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
 		$catid = intval($catid);
 		$sql = "SELECT title FROM $table
@@ -401,7 +401,7 @@ 
 		$categories = self::getListOfCategoriesIDForTestObject($exercise_obj);
 		foreach ($categories as $cat_id) {
 			$cat = new TestCategory($cat_id);
-			$cat = (array)$cat;
+			$cat = (array) $cat;
 			$cat['iid'] = $cat['id'];
 			$cat['title'] = $cat['name'];
 			$result[$cat['id']] = $cat;
@@ -436,7 +436,7 @@ 
 		$quiz->read($exerciseId);
 		$tabQuestionList = $quiz->selectQuestionList();
 		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
-		for ($i=1; $i <= count($tabQuestionList); $i++) {
+		for ($i = 1; $i <= count($tabQuestionList); $i++) {
 			if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
 				$nbCatResult++;
 			}
@@ -455,7 +455,7 @@ 
     {
 		$nbquestionresult = 0;
 		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
-		for ($i=0; $i < count($tabcatid); $i++) {
+		for ($i = 0; $i < count($tabcatid); $i++) {
 			if ($tabcatid[$i] > 0 && $tabcatid[$i] > 0) {	// 0 = no category for this questio
 				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
 				if ($nbQuestionInThisCat > $in_nbrandom) {
@@ -486,7 +486,7 @@ 
 		}
 	 	$tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
 	 	$tabresult = array("0"=>get_lang('NoCategorySelected'));
-	 	for ($i=0; $i < count($tabcatobject); $i++) {
+	 	for ($i = 0; $i < count($tabcatobject); $i++) {
 	 		$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
 	 	}
 	 	return $tabresult;
@@ -610,7 +610,7 @@ 
      */
     public static function returnCategoryAndTitle($questionId, $in_display_category_name = 1)
     {
-        $is_student = !(api_is_allowed_to_edit(null,true) || api_is_session_admin());
+        $is_student = !(api_is_allowed_to_edit(null, true) || api_is_session_admin());
         // @todo fix $_SESSION['objExercise']
         $objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;
         if (!empty($objExercise)) {
@@ -648,7 +648,7 @@ 
     public static function sortTabByBracketLabel($in_tab)
     {
 		$tabResult = array();
-		$tabCatName = array();	// tab of category name
+		$tabCatName = array(); // tab of category name
 		while (list($cat_id, $tabquestion) = each($in_tab)) {
 			$catTitle = new TestCategory($cat_id);
 			$tabCatName[$cat_id] = $catTitle->name;
@@ -669,7 +669,7 @@ 
 	 */
 	public static function getCatScoreForExeidForUserid($in_cat_id, $in_exe_id, $in_user_id)
 	{
-		$tbl_track_attempt		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+		$tbl_track_attempt = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 		$tbl_question_rel_category = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
 		$in_cat_id = intval($in_cat_id);
 		$in_exe_id = intval($in_exe_id);
@@ -701,7 +701,7 @@ 
         $res_num_max = 0;
         // foreach question
 		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
-		for ($i=0; $i < count($tabcatid); $i++) {
+		for ($i = 0; $i < count($tabcatid); $i++) {
 			if ($tabcatid[$i] > 0) {	// 0 = no category for this question
 				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
                 if ($nbQuestionInThisCat > $res_num_max) {
@@ -775,7 +775,7 @@ 
 		$table = Database::get_course_table(TABLE_QUIZ_CATEGORY);
 		$sql = "SELECT * FROM $table ORDER BY title ASC";
 		$res = Database::query($sql);
-		while ($row = Database::fetch_array($res,'ASSOC')) {
+		while ($row = Database::fetch_array($res, 'ASSOC')) {
 			$array[] = $row;
 		}
 		return $array;
@@ -842,7 +842,7 @@ 
 
 	public function getForm(& $form, $action = 'new')
 	{
-		switch($action) {
+		switch ($action) {
 			case 'new':
 				$header = get_lang('AddACategory');
 				$submit = get_lang('AddTestCategory');
@@ -914,8 +914,8 @@ 
 			$return .= $warning;
 			$return .= '<table class="data_table">';
 			$return .= '<tr>';
-			$return .= '<th height="24">' . get_lang('Categories') . '</th>';
-			$return .= '<th width="70" height="24">' . get_lang('Number') . '</th></tr>';
+			$return .= '<th height="24">'.get_lang('Categories').'</th>';
+			$return .= '<th width="70" height="24">'.get_lang('Number').'</th></tr>';
 
 			$emptyCategory = array(
 				'id' => '0',
@@ -936,7 +936,7 @@ 
 				$return .= '</td>';
 				$return .= '<td>';
 				$value = isset($saved_categories) && isset($saved_categories[$cat_id]) ? $saved_categories[$cat_id]['count_questions'] : -1;
-				$return .= '<input name="category['.$cat_id.']" value="' .$value.'" />';
+				$return .= '<input name="category['.$cat_id.']" value="'.$value.'" />';
 				$return .= '</td>';
 				$return .= '</tr>';
 			}
@@ -1083,20 +1083,20 @@ 
             $tmpobj = new TestCategory($category['id']);
             $nb_question = $tmpobj->getCategoryQuestionsNumber();
             $rowname = self::protectJSDialogQuote($category['title']);
-            $nb_question_label = $nb_question == 1 ? $nb_question . ' ' . get_lang('Question') : $nb_question . ' ' . get_lang('Questions');
+            $nb_question_label = $nb_question == 1 ? $nb_question.' '.get_lang('Question') : $nb_question.' '.get_lang('Questions');
 
             //$html .= '<div class="sectiontitle" id="id_cat' . $category['id'] . '">';
-            $content = "<span style='float:right'>" . $nb_question_label . "</span>";
+            $content = "<span style='float:right'>".$nb_question_label."</span>";
 
             $content .= '<div class="sectioncomment">';
             $content .= $category['description'];
             $content .= '</div>';
 
-            $links = '<a href="' . api_get_self() . '?action=editcategory&category_id=' . $category['id'] . '">' .
-                Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
-            $links .= ' <a href="' . api_get_self() . '?action=deletecategory&category_id=' . $category['id'] . '" ';
-            $links .= 'onclick="return confirmDelete(\'' . self::protectJSDialogQuote(get_lang('DeleteCategoryAreYouSure') . '[' . $rowname) . '] ?\', \'id_cat' . $category['id'] . '\');">';
-            $links .= Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+            $links = '<a href="'.api_get_self().'?action=editcategory&category_id='.$category['id'].'">'.
+                Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
+            $links .= ' <a href="'.api_get_self().'?action=deletecategory&category_id='.$category['id'].'" ';
+            $links .= 'onclick="return confirmDelete(\''.self::protectJSDialogQuote(get_lang('DeleteCategoryAreYouSure').'['.$rowname).'] ?\', \'id_cat'.$category['id'].'\');">';
+            $links .= Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
             $html .= Display::panel($content, $category['title'].$links);
         }
 

main/exercice/exercise_submit.php

Indentation +190 added lines, -190 removed lines

@@ -116,7 +116,7 @@ 
     if (!$objExercise->read($exerciseId) ||
         (!$objExercise->selectStatus() && !$is_allowedToEdit && $origin != 'learnpath')
     ) {
-    	if ($debug) {error_log('1.1. Error while reading the exercise'); };
+        if ($debug) {error_log('1.1. Error while reading the exercise'); };
         unset ($objExercise);
         $error = get_lang('ExerciseNotFound');
     } else {
@@ -130,13 +130,13 @@ 
 
 //2. Checking if $objExercise is set
 if (!isset($objExercise) && isset($exerciseInSession)) {
-	if ($debug) { error_log('2. Loading $objExercise from session'); };
+    if ($debug) { error_log('2. Loading $objExercise from session'); };
     $objExercise = $exerciseInSession;
 }
 
 //3. $objExercise is not set, then return to the exercise list
 if (!is_object($objExercise)) {
-	if ($debug) {error_log('3. $objExercise was not set, kill the script'); };
+    if ($debug) {error_log('3. $objExercise was not set, kill the script'); };
     header('Location: exercise.php');
     exit;
 }
@@ -157,7 +157,7 @@ 
 
 $time_control = false;
 if ($objExercise->expired_time != 0) {
-	$time_control = true;
+    $time_control = true;
 }
 
 // Generating the time control key for the user
@@ -166,14 +166,14 @@ 
 $_SESSION['duration_time'][$current_expired_time_key] = $current_timestamp;
 
 if ($time_control) {
-	// Get the expired time of the current exercise in track_e_exercises
-	$total_seconds = $objExercise->expired_time*60;
+    // Get the expired time of the current exercise in track_e_exercises
+    $total_seconds = $objExercise->expired_time*60;
 }
 
 $show_clock = true;
 $user_id = api_get_user_id();
 if ($objExercise->selectAttempts() > 0) {
-	$attempt_html = '';
+    $attempt_html = '';
     $attempt_count = Event::get_attempt_count(
         $user_id,
         $exerciseId,
@@ -182,9 +182,9 @@ 
         $learnpath_item_view_id
     );
 
-	if ($attempt_count >= $objExercise->selectAttempts()) {
-		$show_clock = false;
-		if (!api_is_allowed_to_edit(null,true)) {
+    if ($attempt_count >= $objExercise->selectAttempts()) {
+        $show_clock = false;
+        if (!api_is_allowed_to_edit(null,true)) {
             if ($objExercise->results_disabled == 0 && $origin != 'learnpath') {
 
                 // Showing latest attempt according with task BT#1628
@@ -223,29 +223,29 @@ 
                             $attempt_html .= Display::div(get_lang('Score').' '.$marks, array('id'=>'question_question_titlescore'));
                         }
                     }
-					$score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
-					$attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
-				} else {
-					$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
-				}
-			} else {
-				$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
-			}
-		} else {
-			$attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
-		}
+                    $score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
+                    $attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
+                } else {
+                    $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+                }
+            } else {
+                $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+            }
+        } else {
+            $attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+        }
 
-		if ($origin == 'learnpath') {
-			Display :: display_reduced_header();
-		} else {
-			Display :: display_header($nameTools,'Exercises');
-		}
+        if ($origin == 'learnpath') {
+            Display :: display_reduced_header();
+        } else {
+            Display :: display_header($nameTools,'Exercises');
+        }
 
-		echo $attempt_html;
-		if ($origin != 'learnpath')
-			Display :: display_footer();
-		exit;
-	}
+        echo $attempt_html;
+        if ($origin != 'learnpath')
+            Display :: display_footer();
+        exit;
+    }
 }
 
 if ($debug) {
@@ -296,26 +296,26 @@ 
 
 if (empty($exercise_stat_info)) {
     if ($debug)  error_log('5  $exercise_stat_info is empty ');
-	$total_weight = 0;
-	$questionList = $objExercise->get_validated_question_list();
-	foreach ($questionListUncompressed as $question_id) {
-		$objQuestionTmp = Question::read($question_id);
-		$total_weight += floatval($objQuestionTmp->weighting);
-	}
+    $total_weight = 0;
+    $questionList = $objExercise->get_validated_question_list();
+    foreach ($questionListUncompressed as $question_id) {
+        $objQuestionTmp = Question::read($question_id);
+        $total_weight += floatval($objQuestionTmp->weighting);
+    }
 
-	if ($time_control) {
-		$expected_time = $current_timestamp + $total_seconds;
+    if ($time_control) {
+        $expected_time = $current_timestamp + $total_seconds;
 
-		if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
-		if ($debug)  error_log('5.2. $expected_time '.$expected_time);
+        if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
+        if ($debug)  error_log('5.2. $expected_time '.$expected_time);
 
-		$clock_expired_time 	= api_get_utc_datetime($expected_time);
-		if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
+        $clock_expired_time 	= api_get_utc_datetime($expected_time);
+        if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
 
-		//Sessions  that contain the expired time
-		$_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
-		if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
-	}
+        //Sessions  that contain the expired time
+        $_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
+        if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
+    }
 
     $exe_id = $objExercise->save_stat_track_exercise_info(
         $clock_expired_time,
@@ -332,7 +332,7 @@ 
     );
     if ($debug)  error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
 } else {
-	$exe_id = $exercise_stat_info['exe_id'];
+    $exe_id = $exercise_stat_info['exe_id'];
     // Remember last question id position.
     $isFirstTime = Session::read('firstTime');
     if ($isFirstTime && $objExercise->type == ONE_PER_PAGE) {
@@ -362,9 +362,9 @@ 
 if ($debug) { error_log('6. $objExercise->get_stat_track_exercise_info function called::  '.print_r($exercise_stat_info, 1)); };
 
 if (!empty($exercise_stat_info['questions_to_check'])) {
-	$my_remind_list = $exercise_stat_info['questions_to_check'];
-	$my_remind_list = explode(',', $my_remind_list);
-	$my_remind_list = array_filter($my_remind_list);
+    $my_remind_list = $exercise_stat_info['questions_to_check'];
+    $my_remind_list = explode(',', $my_remind_list);
+    $my_remind_list = array_filter($my_remind_list);
 }
 
 $params = "exe_id=$exe_id&exerciseId=$exerciseId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id&".api_get_cidreq();
@@ -372,8 +372,8 @@ 
 
 if ($reminder == 2 && empty($my_remind_list)) {
     if ($debug) { error_log("6.2 calling the exercise_reminder.php "); };
-	header('Location: exercise_reminder.php?'.$params);
-	exit;
+    header('Location: exercise_reminder.php?'.$params);
+    exit;
 }
 
 /*
@@ -381,56 +381,56 @@ 
  * If the expired time is major that zero(0) then the expired time is compute on this time.
  */
 if ($time_control) {
-	if ($debug) error_log('7.1. Time control is enabled');
-	if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
-	if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
+    if ($debug) error_log('7.1. Time control is enabled');
+    if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
+    if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
 
     if (!isset($_SESSION['expired_time'][$current_expired_time_key])) {
         //Timer - Get expired_time for a student
         if (!empty($exercise_stat_info)) {
-        	if ($debug) {error_log('7.4 Seems that the session ends and the user want to retake the exam'); };
-	        $expired_time_of_this_attempt = $exercise_stat_info['expired_time_control'];
-			if ($debug) {error_log('7.5 $expired_time_of_this_attempt: '.$expired_time_of_this_attempt); }
-	        // Get the last attempt of an exercise
-	    	$last_attempt_date = Event::getLastAttemptDateOfExercise($exercise_stat_info['exe_id']);
+            if ($debug) {error_log('7.4 Seems that the session ends and the user want to retake the exam'); };
+            $expired_time_of_this_attempt = $exercise_stat_info['expired_time_control'];
+            if ($debug) {error_log('7.5 $expired_time_of_this_attempt: '.$expired_time_of_this_attempt); }
+            // Get the last attempt of an exercise
+            $last_attempt_date = Event::getLastAttemptDateOfExercise($exercise_stat_info['exe_id']);
 
-	    	/* This means that the user enters the exam but do not answer the
+            /* This means that the user enters the exam but do not answer the
 	    	   first question we get the date from the track_e_exercises not from
 	    	   the track_et_attempt see #2069 */
-	    	if (empty($last_attempt_date)) {
-	    		$diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
-	    	} else {
-	    		//Recalculate the time control due #2069
-	    		$diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
-	    	}
-	        if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
-
-	        //New expired time - it is due to the possible closure of session
-	        $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
-	        if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
-
-	        $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
-	        if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
-
-	        $clock_expired_time  = api_get_utc_datetime($expected_time);
-	        if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
-
-			// First we update the attempt to today
-			/* How the expired time is changed into "track_e_exercises" table,
+            if (empty($last_attempt_date)) {
+                $diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
+                $last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
+            } else {
+                //Recalculate the time control due #2069
+                $diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
+                $last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
+            }
+            if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
+
+            //New expired time - it is due to the possible closure of session
+            $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
+            if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
+
+            $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
+            if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
+
+            $clock_expired_time  = api_get_utc_datetime($expected_time);
+            if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
+
+            // First we update the attempt to today
+            /* How the expired time is changed into "track_e_exercises" table,
                then the last attempt for this student should be changed too */
-	        $sql = "UPDATE $exercise_attempt_table SET
+            $sql = "UPDATE $exercise_attempt_table SET
 	                tms = '".api_get_utc_datetime()."'
 	                WHERE
 	                    exe_id = '".$exercise_stat_info['exe_id']."' AND
 	                    tms = '".$last_attempt_date."' ";
-	        if ($debug) {error_log('7.10. $sql: '.$sql); }
-	        Database::query($sql);
+            if ($debug) {error_log('7.10. $sql: '.$sql); }
+            Database::query($sql);
 
-	        //Sessions  that contain the expired time
-	        $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
-	        if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
+            //Sessions  that contain the expired time
+            $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
+            if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
         }
     } else {
         $clock_expired_time =  $_SESSION['expired_time'][$current_expired_time_key];
@@ -447,7 +447,7 @@ 
  * for more details of how it works see this link : http://eric.garside.name/docs.html?p=epiclock
  */
 if ($time_control) { //Sends the exercise form when the expired time is finished
-	$htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);
+    $htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);
 }
 
 // if the user has submitted the form
@@ -461,14 +461,14 @@ 
     // selects the list of question ID
     $questionList = $objExercise->get_validated_question_list();
     if ($objExercise->isRandom() && !empty($exercise_stat_info['data_tracking'])) {
-    	$questionList = explode(',', $exercise_stat_info['data_tracking']);
+        $questionList = explode(',', $exercise_stat_info['data_tracking']);
     }
     Session::write('questionList', $questionList);
     if ($debug > 0) { error_log('$_SESSION[questionList] was set'); }
 } else {
-	if (isset($objExercise) && isset($_SESSION['objExercise'])) {
-    	$questionList = $_SESSION['questionList'];
-	}
+    if (isset($objExercise) && isset($_SESSION['objExercise'])) {
+        $questionList = $_SESSION['questionList'];
+    }
 }
 
 if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
@@ -476,7 +476,7 @@ 
 //Real question count
 $question_count = 0;
 if (!empty($questionList)) {
-	$question_count = count($questionList);
+    $question_count = count($questionList);
 }
 
 if ($formSent && isset($_POST)) {
@@ -518,11 +518,11 @@ 
                 //saving each question
                 if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_DIRECT) {
                     $nro_question = $current_question; // - 1;
-                 	$questionId   = $key;
+                        $questionId   = $key;
                     // gets the student choice for this question
                     $choice = $exerciseResult[$questionId];
                     if (isset($exe_id)) {
-                    	// Manage the question and answer attempts
+                        // Manage the question and answer attempts
                         if ($debug) { error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice,1)); }
                         $objExercise->manage_answer(
                             $exe_id,
@@ -611,58 +611,58 @@ 
 }
 
 if ($question_count != 0) {
-	if (($objExercise->type == ALL_ON_ONE_PAGE ||
+    if (($objExercise->type == ALL_ON_ONE_PAGE ||
         $current_question > $question_count)
     ) {
-	    if (api_is_allowed_to_session_edit()) {
-	        // goes to the script that will show the result of the exercise
-	        if ($objExercise->type == ALL_ON_ONE_PAGE) {
-	            if ($debug) { error_log('12. Exercise ALL_ON_ONE_PAGE -> Redirecting to exercise_result.php'); }
-
-	            //We check if the user attempts before sending to the exercise_result.php
-	            if ($objExercise->selectAttempts() > 0) {
-	                $attempt_count = Event::get_attempt_count(
+        if (api_is_allowed_to_session_edit()) {
+            // goes to the script that will show the result of the exercise
+            if ($objExercise->type == ALL_ON_ONE_PAGE) {
+                if ($debug) { error_log('12. Exercise ALL_ON_ONE_PAGE -> Redirecting to exercise_result.php'); }
+
+                //We check if the user attempts before sending to the exercise_result.php
+                if ($objExercise->selectAttempts() > 0) {
+                    $attempt_count = Event::get_attempt_count(
                         api_get_user_id(),
                         $exerciseId,
                         $learnpath_id,
                         $learnpath_item_id,
                         $learnpath_item_view_id
                     );
-	                if ($attempt_count >= $objExercise->selectAttempts()) {
-	                    Display :: display_warning_message(
+                    if ($attempt_count >= $objExercise->selectAttempts()) {
+                        Display :: display_warning_message(
                             sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()),
                             false
                         );
-	                    if ($origin != 'learnpath') {
-	                        //so we are not in learnpath tool
-	                        echo '</div>'; //End glossary div
-	                        Display :: display_footer();
-	                    } else {
-	                        echo '</body></html>';
-	                    }
-	                    exit;
-	                }
-	            }
-	        } else {
-	            if ($objExercise->review_answers) {
-	            	header('Location: exercise_reminder.php?'.$params);
-	            	exit;
-	            } else {
+                        if ($origin != 'learnpath') {
+                            //so we are not in learnpath tool
+                            echo '</div>'; //End glossary div
+                            Display :: display_footer();
+                        } else {
+                            echo '</body></html>';
+                        }
+                        exit;
+                    }
+                }
+            } else {
+                if ($objExercise->review_answers) {
+                    header('Location: exercise_reminder.php?'.$params);
+                    exit;
+                } else {
                     header("Location: exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
                     exit;
-	            }
-	        }
-	    } else {
-	        if ($debug) { error_log('Redirecting to exercise_submit.php'); }
-	        exit;
-	    }
-	}
+                }
+            }
+        } else {
+            if ($debug) { error_log('Redirecting to exercise_submit.php'); }
+            exit;
+        }
+    }
 } else {
-	$error = get_lang('ThereAreNoQuestionsForThisExercise');
-	// if we are in the case where user select random by category, but didn't choose the number of random question
-	if ($objExercise->selectRandomByCat() > 0 && $objExercise->random <= 0) {
-		$error .= "<br/>".get_lang('PleaseSelectSomeRandomQuestion');
-	}
+    $error = get_lang('ThereAreNoQuestionsForThisExercise');
+    // if we are in the case where user select random by category, but didn't choose the number of random question
+    if ($objExercise->selectRandomByCat() > 0 && $objExercise->random <= 0) {
+        $error .= "<br/>".get_lang('PleaseSelectSomeRandomQuestion');
+    }
 }
 
 if (!empty ($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
@@ -701,9 +701,9 @@ 
 if (api_is_course_admin() && $origin != 'learnpath') {
     echo '<div class="actions">';
     if ($show_quiz_edition == false) {
-    	echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
     } else {
-    	echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
     }
     echo '</div>';
 }
@@ -746,7 +746,7 @@ 
             $message_warning = $permission_to_start ? get_lang('ReachedTimeLimit') : get_lang('ExerciseNoStartedYet');
             Display :: display_warning_message(sprintf($message_warning, $exercise_title, $objExercise->selectAttempts()));
             if ($origin != 'learnpath') {
-            	Display :: display_footer();
+                Display :: display_footer();
             }
             exit;
         } else {
@@ -761,7 +761,7 @@ 
 if (isset($_custom['exercises_hidden_when_no_start_date']) &&
     $_custom['exercises_hidden_when_no_start_date']
 ) {
-	if (empty($objExercise->start_time) || $objExercise->start_time == '0000-00-00 00:00:00') {
+    if (empty($objExercise->start_time) || $objExercise->start_time == '0000-00-00 00:00:00') {
         Display:: display_warning_message(
             sprintf(
                 get_lang('ExerciseNoStartedYet'),
@@ -769,20 +769,20 @@ 
                 $objExercise->selectAttempts()
             )
         );
-		if ($origin != 'learnpath') {
-			Display :: display_footer();
-		}
-	}
+        if ($origin != 'learnpath') {
+            Display :: display_footer();
+        }
+    }
 }
 
 //Timer control
 if ($time_control) {
     echo $objExercise->return_time_left_div();
-	echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
+    echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
 }
 
 if ($origin != 'learnpath') {
-   echo '<div id="highlight-plugin" class="glossary-content">';
+    echo '<div id="highlight-plugin" class="glossary-content">';
 }
 
 if ($reminder == 2)  {
@@ -794,53 +794,53 @@ 
     $current_question = 1; //set by default the 1st question
 
     if (!empty($my_remind_list)) {
-    	// Checking which questions we are going to call from the remind list
-		for ($i = 0; $i < count($data_tracking); $i++) {
-			for($j = 0; $j < count($my_remind_list); $j++) {
-
-				if (!empty($remind_question_id)) {
-					if ($remind_question_id == $my_remind_list[$j]) {
-
-			        	if ($remind_question_id == $data_tracking[$i]) {
-			        		if (isset($my_remind_list[$j+1])) {
-			        			$remind_question_id = $my_remind_list[$j+1];
-			        			$current_question = $i + 1;
-			        		} else {
+        // Checking which questions we are going to call from the remind list
+        for ($i = 0; $i < count($data_tracking); $i++) {
+            for($j = 0; $j < count($my_remind_list); $j++) {
+
+                if (!empty($remind_question_id)) {
+                    if ($remind_question_id == $my_remind_list[$j]) {
+
+                        if ($remind_question_id == $data_tracking[$i]) {
+                            if (isset($my_remind_list[$j+1])) {
+                                $remind_question_id = $my_remind_list[$j+1];
+                                $current_question = $i + 1;
+                            } else {
                                 // We end the remind list we go to the exercise_reminder.php please
-			        			$remind_question_id = -1;
-			        			$current_question = $i + 1; // last question
-			        		}
-			        		break 2;
-			            }
-					}
-				} else {
-					if ($my_remind_list[$j] == $data_tracking[$i]) {
-						if (isset($my_remind_list[$j+1])) {
-							$remind_question_id = $my_remind_list[$j+1];
-							$current_question = $i + 1; // last question
-						} else {
+                                $remind_question_id = -1;
+                                $current_question = $i + 1; // last question
+                            }
+                            break 2;
+                        }
+                    }
+                } else {
+                    if ($my_remind_list[$j] == $data_tracking[$i]) {
+                        if (isset($my_remind_list[$j+1])) {
+                            $remind_question_id = $my_remind_list[$j+1];
+                            $current_question = $i + 1; // last question
+                        } else {
                             // We end the remind list we go to the exercise_reminder.php please
-							$remind_question_id = -1;
-							$current_question = $i + 1; // last question
-						}
-						break 2;
-					}
-				}
-			}
+                            $remind_question_id = -1;
+                            $current_question = $i + 1; // last question
+                        }
+                        break 2;
+                    }
+                }
+            }
         }
     } else {
-    	if ($objExercise->review_answers) {
+        if ($objExercise->review_answers) {
             if ($debug) { error_log('. redirecting to exercise_reminder.php '); }
-	    	header("Location: exercise_reminder.php?$params");
-	    	exit;
-    	}
+            header("Location: exercise_reminder.php?$params");
+            exit;
+        }
     }
 }
 
 if ($objExercise->review_answers) {
-	$script_php = 'exercise_reminder.php';
+    $script_php = 'exercise_reminder.php';
 } else {
-	$script_php = 'exercise_result.php';
+    $script_php = 'exercise_result.php';
 }
 
 if (!empty($error)) {
@@ -1084,7 +1084,7 @@ 
          <input type="hidden" name="learnpath_item_id" 		value="'.$learnpath_item_id . '" />
          <input type="hidden" name="learnpath_item_view_id" value="'.$learnpath_item_view_id . '" />';
 
-	// Show list of questions
+    // Show list of questions
     $i = 1;
     $attempt_list = array();
     if (isset($exe_id)) {
@@ -1134,10 +1134,10 @@ 
 
         $attributes = array('id' =>'remind_list['.$questionId.']');
         if (in_array($questionId, $remind_list)) {
-        	$is_remind_on = true;
-        	$attributes['checked'] = 1;
-        	$remind_question = true;
-        	$remind_highlight = ' remind_highlight ';
+            $is_remind_on = true;
+            $attributes['checked'] = 1;
+            $remind_question = true;
+            $remind_highlight = ' remind_highlight ';
         }
 
         // Showing the exercise description
@@ -1211,8 +1211,8 @@ 
     }
     // end foreach()
     if ($objExercise->type == ALL_ON_ONE_PAGE) {
-    	$exercise_actions =  $objExercise->show_button($questionId, $current_question);
-    	echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
+        $exercise_actions =  $objExercise->show_button($questionId, $current_question);
+        echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
         echo '<br>';
     }
     echo '</form>';

Spacing +73 added lines, -73 removed lines

@@ -29,7 +29,7 @@ 
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_QUIZ;
+$current_course_tool = TOOL_QUIZ;
 $this_section = SECTION_COURSES;
 $debug = false;
 
@@ -38,7 +38,7 @@ 
 
 $origin = isset($_REQUEST['origin']) ? Security::remove_XSS($_REQUEST['origin']) : '';
 
-$is_allowedToEdit = api_is_allowed_to_edit(null,true);
+$is_allowedToEdit = api_is_allowed_to_edit(null, true);
 $glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');
 
 $showGlossary = in_array($glossaryExtraTools, array('true', 'exercise', 'exercise_and_lp'));
@@ -60,8 +60,8 @@ 
 $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
 $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.epiclock.min.js');
 $htmlHeadXtra[] = api_get_js('epiclock/renderers/minute/epiclock.minute.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>';
 
 $template = new Template();
 
@@ -69,7 +69,7 @@ 
 
 $learnpath_id = isset($_REQUEST['learnpath_id']) ? intval($_REQUEST['learnpath_id']) : 0;
 $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? intval($_REQUEST['learnpath_item_id']) : 0;
-$learnpath_item_view_id	= isset($_REQUEST['learnpath_item_view_id']) ? intval($_REQUEST['learnpath_item_view_id']) : 0;
+$learnpath_item_view_id = isset($_REQUEST['learnpath_item_view_id']) ? intval($_REQUEST['learnpath_item_view_id']) : 0;
 
 $reminder = isset($_REQUEST['reminder']) ? intval($_REQUEST['reminder']) : 0;
 $remind_question_id = isset($_REQUEST['remind_question_id']) ? intval($_REQUEST['remind_question_id']) : 0;
@@ -96,7 +96,7 @@ 
 /*  Teacher takes an exam and want to see a preview,
     we delete the objExercise from the session in order to get the latest
     changes in the exercise */
-if (api_is_allowed_to_edit(null, true) && isset($_GET['preview']) && $_GET['preview'] == 1 ) {
+if (api_is_allowed_to_edit(null, true) && isset($_GET['preview']) && $_GET['preview'] == 1) {
     Session::erase('objExercise');
 }
 
@@ -167,7 +167,7 @@ 
 
 if ($time_control) {
 	// Get the expired time of the current exercise in track_e_exercises
-	$total_seconds = $objExercise->expired_time*60;
+	$total_seconds = $objExercise->expired_time * 60;
 }
 
 $show_clock = true;
@@ -184,7 +184,7 @@ 
 
 	if ($attempt_count >= $objExercise->selectAttempts()) {
 		$show_clock = false;
-		if (!api_is_allowed_to_edit(null,true)) {
+		if (!api_is_allowed_to_edit(null, true)) {
             if ($objExercise->results_disabled == 0 && $origin != 'learnpath') {
 
                 // Showing latest attempt according with task BT#1628
@@ -214,7 +214,7 @@ 
                     );
 
                     if (!empty($last_attempt_info['question_list'])) {
-                        foreach($last_attempt_info['question_list'] as $question_data) {
+                        foreach ($last_attempt_info['question_list'] as $question_data) {
                             $question_id = $question_data['question_id'];
                             $marks       = $question_data['marks'];
 
@@ -223,7 +223,7 @@ 
                             $attempt_html .= Display::div(get_lang('Score').' '.$marks, array('id'=>'question_question_titlescore'));
                         }
                     }
-					$score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
+					$score = ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
 					$attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
 				} else {
 					$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
@@ -238,7 +238,7 @@ 
 		if ($origin == 'learnpath') {
 			Display :: display_reduced_header();
 		} else {
-			Display :: display_header($nameTools,'Exercises');
+			Display :: display_header($nameTools, 'Exercises');
 		}
 
 		echo $attempt_html;
@@ -309,12 +309,12 @@ 
 		if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
 		if ($debug)  error_log('5.2. $expected_time '.$expected_time);
 
-		$clock_expired_time 	= api_get_utc_datetime($expected_time);
+		$clock_expired_time = api_get_utc_datetime($expected_time);
 		if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
 
 		//Sessions  that contain the expired time
-		$_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
-		if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
+		$_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
+		if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key]); };
 	}
 
     $exe_id = $objExercise->save_stat_track_exercise_info(
@@ -399,22 +399,22 @@ 
 	    	   the track_et_attempt see #2069 */
 	    	if (empty($last_attempt_date)) {
 	    		$diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
+	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'], 'UTC') + $diff);
 	    	} else {
 	    		//Recalculate the time control due #2069
-	    		$diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
+	    		$diff = $current_timestamp - api_strtotime($last_attempt_date, 'UTC');
+	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date, 'UTC') + $diff);
 	    	}
 	        if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
 
 	        //New expired time - it is due to the possible closure of session
-	        $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
+	        $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date, 'UTC');
 	        if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
 
-	        $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
+	        $expected_time = $current_timestamp + $new_expired_time_in_seconds;
 	        if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
 
-	        $clock_expired_time  = api_get_utc_datetime($expected_time);
+	        $clock_expired_time = api_get_utc_datetime($expected_time);
 	        if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
 
 			// First we update the attempt to today
@@ -430,17 +430,17 @@ 
 
 	        //Sessions  that contain the expired time
 	        $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
-	        if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
+	        if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key]); };
         }
     } else {
-        $clock_expired_time =  $_SESSION['expired_time'][$current_expired_time_key];
+        $clock_expired_time = $_SESSION['expired_time'][$current_expired_time_key];
     }
 } else {
     if ($debug) { error_log("7 No 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();
 
 /*
  * The time control feature is enable here - this feature is enable for a jquery plugin called epiclock
@@ -490,7 +490,7 @@ 
 
     //Only for hotspot
     if (!isset($choice) && isset($_REQUEST['hidden_hotspot_id'])) {
-        $hotspot_id = (int)($_REQUEST['hidden_hotspot_id']);
+        $hotspot_id = (int) ($_REQUEST['hidden_hotspot_id']);
         $choice     = array($hotspot_id => '');
     }
 
@@ -518,12 +518,12 @@ 
                 //saving each question
                 if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_DIRECT) {
                     $nro_question = $current_question; // - 1;
-                 	$questionId   = $key;
+                 	$questionId = $key;
                     // gets the student choice for this question
                     $choice = $exerciseResult[$questionId];
                     if (isset($exe_id)) {
                     	// Manage the question and answer attempts
-                        if ($debug) { error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice,1)); }
+                        if ($debug) { error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice, 1)); }
                         $objExercise->manage_answer(
                             $exe_id,
                             $questionId,
@@ -542,13 +542,13 @@ 
             }
         }
         if ($debug) { error_log('9.3.  $choice is an array - end'); }
-        if ($debug) { error_log('9.4.  $exerciseResult '.print_r($exerciseResult,1)); }
+        if ($debug) { error_log('9.4.  $exerciseResult '.print_r($exerciseResult, 1)); }
     }
 
     // the script "exercise_result.php" will take the variable $exerciseResult from the session
     Session::write('exerciseResult', $exerciseResult);
     Session::write('remind_list', $remind_list);
-    Session::write('exerciseResultCoordinates',$exerciseResultCoordinates);
+    Session::write('exerciseResultCoordinates', $exerciseResultCoordinates);
 
     // if all questions on one page OR if it is the last question (only for an exercise with one question per page)
     if ($objExercise->type == ALL_ON_ONE_PAGE || $current_question >= $question_count) {
@@ -674,15 +674,15 @@ 
 }
 
 if (!empty ($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array ('url' => '../gradebook/' . Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[] = array('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']), 'name' => get_lang('ToolGradebook'));
 }
 
-$interbreadcrumb[] = array ("url" => "exercise.php?".api_get_cidreq(),	"name" => get_lang('Exercises'));
-$interbreadcrumb[] = array ("url" => "#", "name" => $objExercise->name);
+$interbreadcrumb[] = array("url" => "exercise.php?".api_get_cidreq(), "name" => get_lang('Exercises'));
+$interbreadcrumb[] = array("url" => "#", "name" => $objExercise->name);
 
 if ($origin != 'learnpath') { //so we are not in learnpath tool
-    Display :: display_header(null,'Exercises');
-    if (!api_is_allowed_to_session_edit() ) {
+    Display :: display_header(null, 'Exercises');
+    if (!api_is_allowed_to_session_edit()) {
         Display :: display_warning_message(get_lang('SessionIsReadOnly'));
     }
 } else {
@@ -701,9 +701,9 @@ 
 if (api_is_course_admin() && $origin != 'learnpath') {
     echo '<div class="actions">';
     if ($show_quiz_edition == false) {
-    	echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+    	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
-    	echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+    	echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     echo '</div>';
 }
@@ -742,7 +742,7 @@ 
     }
 
     if (!$permission_to_start || $exercise_timeover) {
-        if (!api_is_allowed_to_edit(null,true)) {
+        if (!api_is_allowed_to_edit(null, true)) {
             $message_warning = $permission_to_start ? get_lang('ReachedTimeLimit') : get_lang('ExerciseNoStartedYet');
             Display :: display_warning_message(sprintf($message_warning, $exercise_title, $objExercise->selectAttempts()));
             if ($origin != 'learnpath') {
@@ -785,7 +785,7 @@ 
    echo '<div id="highlight-plugin" class="glossary-content">';
 }
 
-if ($reminder == 2)  {
+if ($reminder == 2) {
     if ($debug) { error_log(' $reminder == 2'); }
 
     $data_tracking  = $exercise_stat_info['data_tracking'];
@@ -796,14 +796,14 @@ 
     if (!empty($my_remind_list)) {
     	// Checking which questions we are going to call from the remind list
 		for ($i = 0; $i < count($data_tracking); $i++) {
-			for($j = 0; $j < count($my_remind_list); $j++) {
+			for ($j = 0; $j < count($my_remind_list); $j++) {
 
 				if (!empty($remind_question_id)) {
 					if ($remind_question_id == $my_remind_list[$j]) {
 
 			        	if ($remind_question_id == $data_tracking[$i]) {
-			        		if (isset($my_remind_list[$j+1])) {
-			        			$remind_question_id = $my_remind_list[$j+1];
+			        		if (isset($my_remind_list[$j + 1])) {
+			        			$remind_question_id = $my_remind_list[$j + 1];
 			        			$current_question = $i + 1;
 			        		} else {
                                 // We end the remind list we go to the exercise_reminder.php please
@@ -815,8 +815,8 @@ 
 					}
 				} else {
 					if ($my_remind_list[$j] == $data_tracking[$i]) {
-						if (isset($my_remind_list[$j+1])) {
-							$remind_question_id = $my_remind_list[$j+1];
+						if (isset($my_remind_list[$j + 1])) {
+							$remind_question_id = $my_remind_list[$j + 1];
 							$current_question = $i + 1; // last question
 						} else {
                             // We end the remind list we go to the exercise_reminder.php please
@@ -847,7 +847,7 @@ 
     Display :: display_error_message($error, false);
 } else {
     if (!empty ($exercise_sound)) {
-        echo "<a href=\"../document/download.php?doc_url=%2Faudio%2F" . Security::remove_XSS($exercise_sound) . "\" target=\"_blank\">", "<img src=\"../img/sound.gif\" border=\"0\" align=\"absmiddle\" alt=", get_lang('Sound') . "\" /></a>";
+        echo "<a href=\"../document/download.php?doc_url=%2Faudio%2F".Security::remove_XSS($exercise_sound)."\" target=\"_blank\">", "<img src=\"../img/sound.gif\" border=\"0\" align=\"absmiddle\" alt=", get_lang('Sound')."\" /></a>";
     }
     // Get number of hotspot questions for javascript validation
     $number_of_hotspot_questions = 0;
@@ -882,7 +882,7 @@ 
     }
 
     if ($number_of_hotspot_questions > 0) {
-        $onsubmit = "onsubmit=\"return validateFlashVar('" . $number_of_hotspot_questions . "', '" . get_lang('HotspotValidateError1') . "', '" . get_lang('HotspotValidateError2') . "');\"";
+        $onsubmit = "onsubmit=\"return validateFlashVar('".$number_of_hotspot_questions."', '".get_lang('HotspotValidateError1')."', '".get_lang('HotspotValidateError2')."');\"";
     }
 
     echo '<script>
@@ -896,7 +896,7 @@ 
                 ICON_SIZE_SMALL,
                 false,
                 true
-            ) . '\';
+            ).'\';
 
             // Block form submition on enter
             $(".block_on_enter").keypress(function(event) {
@@ -948,7 +948,7 @@ 
             } else {
                 url = "exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'";
             }
-            //$("#save_for_now_"+question_id).html(\'' . Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL) . '\');
+            //$("#save_for_now_"+question_id).html(\'' . Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL).'\');
             window.location = url;
         }
 
@@ -980,7 +980,7 @@ 
 
             // Only for the first time
 
-            $("#save_for_now_"+question_id).html(\'' . Display::returnFontAwesomeIcon('spinner', true, null, 'fa-spin') . '\');
+            $("#save_for_now_"+question_id).html(\'' . Display::returnFontAwesomeIcon('spinner', true, null, 'fa-spin').'\');
             $.ajax({
                 type:"post",
                 async: false,
@@ -988,9 +988,9 @@ 
                 data: "'.$params.'&type=simple&question_id="+question_id+"&"+my_choice+"&"+hotspot+"&"+remind_list,
                 success: function(return_value) {
                     if (return_value == "ok") {
-                        $("#save_for_now_"+question_id).html(\'' . Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL) . '\');
+                        $("#save_for_now_"+question_id).html(\'' . Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL).'\');
                     } else if (return_value == "error") {
-                        $("#save_for_now_"+question_id).html(\'' . Display::return_icon('error.png', get_lang('Error'), array(), ICON_SIZE_SMALL) . '\');
+                        $("#save_for_now_"+question_id).html(\'' . Display::return_icon('error.png', get_lang('Error'), array(), ICON_SIZE_SMALL).'\');
                     } else if (return_value == "one_per_page") {
                         var url = "";
                         if ('.$reminder.' == 1 ) {
@@ -1005,13 +1005,13 @@ 
                             url = url_extra;
                         }
 
-                        $("#save_for_now_"+question_id).html(\'' . Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL) . '\');
+                        $("#save_for_now_"+question_id).html(\'' . Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL).'\');
 
                         window.location = url;
                     }
                 },
                 error: function() {
-                    $("#save_for_now_"+question_id).html(\'' . Display::return_icon('error.png', get_lang('Error'), array(), ICON_SIZE_SMALL) . '\');
+                    $("#save_for_now_"+question_id).html(\'' . Display::return_icon('error.png', get_lang('Error'), array(), ICON_SIZE_SMALL).'\');
                 }
             });
             return false;
@@ -1044,7 +1044,7 @@ 
 
             free_answers = $.param(free_answers);
 
-            $("#save_all_reponse").html(\'' . Display::returnFontAwesomeIcon('spinner', true, null, 'fa-spin') . '\');
+            $("#save_all_reponse").html(\'' . Display::returnFontAwesomeIcon('spinner', true, null, 'fa-spin').'\');
 
             $.ajax({
                 type:"post",
@@ -1053,14 +1053,14 @@ 
                 data: "'.$params.'&type=all&"+my_choice+"&"+hotspot+"&"+free_answers+"&"+remind_list,
                 success: function(return_value) {
                     if (return_value == "ok") {
-                        //$("#save_all_reponse").html(\'' . Display::return_icon('accept.png') . '\');
+                        //$("#save_all_reponse").html(\'' . Display::return_icon('accept.png').'\');
                         if (validate == "validate") {
                             window.location = "'.$script_php.'?'.$params.'";
                         } else {
-                            $("#save_all_reponse").html(\'' . Display::return_icon('accept.png') . '\');
+                            $("#save_all_reponse").html(\'' . Display::return_icon('accept.png').'\');
                         }
                     } else {
-                        $("#save_all_reponse").html(\'' . Display::return_icon('wrong.gif') . '\');
+                        $("#save_all_reponse").html(\'' . Display::return_icon('wrong.gif').'\');
                     }
                 }
             });
@@ -1073,16 +1073,16 @@ 
         }
     </script>';
 
-    echo '<form id="exercise_form" method="post" action="'.api_get_self().'?'.api_get_cidreq().'&autocomplete=off&&exerciseId='.$exerciseId .'" name="frm_exercise" '.$onsubmit.'>
+    echo '<form id="exercise_form" method="post" action="'.api_get_self().'?'.api_get_cidreq().'&autocomplete=off&&exerciseId='.$exerciseId.'" name="frm_exercise" '.$onsubmit.'>
          <input type="hidden" name="formSent"				value="1" />
-         <input type="hidden" name="exerciseId" 			value="'.$exerciseId . '" />
+         <input type="hidden" name="exerciseId" 			value="'.$exerciseId.'" />
          <input type="hidden" name="num" 					value="'.$current_question.'" id="num_current_id" />
          <input type="hidden" name="num_answer"             value="'.$currentAnswer.'" id="num_current_answer_id" />
-         <input type="hidden" name="exe_id" 				value="'.$exe_id . '" />
-         <input type="hidden" name="origin" 				value="'.$origin . '" />
-         <input type="hidden" name="learnpath_id" 			value="'.$learnpath_id . '" />
-         <input type="hidden" name="learnpath_item_id" 		value="'.$learnpath_item_id . '" />
-         <input type="hidden" name="learnpath_item_view_id" value="'.$learnpath_item_view_id . '" />';
+         <input type="hidden" name="exe_id" 				value="'.$exe_id.'" />
+         <input type="hidden" name="origin" 				value="'.$origin.'" />
+         <input type="hidden" name="learnpath_id" 			value="'.$learnpath_id.'" />
+         <input type="hidden" name="learnpath_item_id" 		value="'.$learnpath_item_id.'" />
+         <input type="hidden" name="learnpath_item_view_id" value="'.$learnpath_item_view_id.'" />';
 
 	// Show list of questions
     $i = 1;
@@ -1091,7 +1091,7 @@ 
         $attempt_list = Event::getAllExerciseEventByExeId($exe_id);
     }
 
-    $remind_list  = array();
+    $remind_list = array();
     if (isset($exercise_stat_info['questions_to_check']) && !empty($exercise_stat_info['questions_to_check'])) {
         $remind_list = explode(',', $exercise_stat_info['questions_to_check']);
     }
@@ -1129,7 +1129,7 @@ 
             $remind_highlight = 'no_remind_highlight';
         }
 
-        $exercise_actions  = '';
+        $exercise_actions = '';
         $is_remind_on = false;
 
         $attributes = array('id' =>'remind_list['.$questionId.']');
@@ -1141,10 +1141,10 @@ 
         }
 
         // Showing the exercise description
-        if (!empty($objExercise->description)){
-            if ($objExercise->type == ONE_PER_PAGE || ($objExercise->type != ONE_PER_PAGE && $i==1)) {
-                echo Display::panelCollapse('<span>' .
-                    get_lang('ExerciseDescriptionLabel') . '</span>',
+        if (!empty($objExercise->description)) {
+            if ($objExercise->type == ONE_PER_PAGE || ($objExercise->type != ONE_PER_PAGE && $i == 1)) {
+                echo Display::panelCollapse('<span>'.
+                    get_lang('ExerciseDescriptionLabel').'</span>',
                     $objExercise->description,
                     'exercise-description',
                     [],
@@ -1178,7 +1178,7 @@ 
             case ALL_ON_ONE_PAGE :
                 $button  = '<a href="javascript://" class="btn btn-info" onclick="save_now(\''.$questionId.'\'); ">'.get_lang('SaveForNow').'</a>';
                 $button .= '<span id="save_for_now_'.$questionId.'"></span>&nbsp;';
-                $exercise_actions  .= Display::div($button, array('class'=>'exercise_save_now_button'));
+                $exercise_actions .= Display::div($button, array('class'=>'exercise_save_now_button'));
                 break;
         }
 
@@ -1188,13 +1188,13 @@ 
                 'label',
                 Display::input(
                     'checkbox',
-                    'remind_list[' . $questionId . ']',
+                    'remind_list['.$questionId.']',
                     '',
                     $attributes
-                ) . get_lang('ReviewQuestionLater'),
+                ).get_lang('ReviewQuestionLater'),
                 array(
                     'class' => 'checkbox',
-                    'for' => 'remind_list[' . $questionId . ']'
+                    'for' => 'remind_list['.$questionId.']'
                 )
             );
             $exercise_actions .= Display::div($remind_question_div, array('class'=>'exercise_save_now_button'));
@@ -1211,7 +1211,7 @@ 
     }
     // end foreach()
     if ($objExercise->type == ALL_ON_ONE_PAGE) {
-    	$exercise_actions =  $objExercise->show_button($questionId, $current_question);
+    	$exercise_actions = $objExercise->show_button($questionId, $current_question);
     	echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
         echo '<br>';
     }

main/inc/lib/browser/Browser.php

Spacing +16 added lines, -16 removed lines

@@ -345,9 +345,9 @@ 
      */
     public function __toString()
     {
-        return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-        "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-        "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+        return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n".
+        "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n".
+        "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n".
         "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
     }
 
@@ -585,13 +585,13 @@ 
             $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
             $this->setBrowser(self::BROWSER_IE);
             $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-            if(stripos($this->_agent, 'IEMobile') !== false) {
+            if (stripos($this->_agent, 'IEMobile') !== false) {
                 $this->setBrowser(self::BROWSER_POCKET_IE);
                 $this->setMobile(true);
             }
             return true;
         } // Test for versions > IE 10
-		else if(stripos($this->_agent, 'trident') !== false) {
+		else if (stripos($this->_agent, 'trident') !== false) {
 			$this->setBrowser(self::BROWSER_IE);
 			$result = explode('rv:', $this->_agent);
 			$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
@@ -1012,7 +1012,7 @@ 
      */
     protected function checkFacebookExternalHit()
     {
-        if(stristr($this->_agent,'FacebookExternalHit'))
+        if (stristr($this->_agent, 'FacebookExternalHit'))
         {
             $this->setRobot(true);
             $this->setFacebook(true);
@@ -1027,7 +1027,7 @@ 
      */
     protected function checkForFacebookIos()
     {
-        if(stristr($this->_agent,'FBIOS'))
+        if (stristr($this->_agent, 'FBIOS'))
         {
             $this->setFacebook(true);
             return true;
@@ -1041,10 +1041,10 @@ 
      */
     protected function getSafariVersionOnIos()
     {
-        $aresult = explode('/',stristr($this->_agent,'Version'));
-        if( isset($aresult[1]) )
+        $aresult = explode('/', stristr($this->_agent, 'Version'));
+        if (isset($aresult[1]))
         {
-            $aversion = explode(' ',$aresult[1]);
+            $aversion = explode(' ', $aresult[1]);
             $this->setVersion($aversion[0]);
             return true;
         }
@@ -1057,10 +1057,10 @@ 
      */
     protected function getChromeVersionOnIos()
     {
-        $aresult = explode('/',stristr($this->_agent,'CriOS'));
-        if( isset($aresult[1]) )
+        $aresult = explode('/', stristr($this->_agent, 'CriOS'));
+        if (isset($aresult[1]))
         {
-            $aversion = explode(' ',$aresult[1]);
+            $aversion = explode(' ', $aresult[1]);
             $this->setVersion($aversion[0]);
             $this->setBrowser(self::BROWSER_CHROME);
             return true;
@@ -1073,7 +1073,7 @@ 
      * @return boolean True if the browser is iPhone otherwise false
      */
     protected function checkBrowseriPhone() {
-        if( stripos($this->_agent,'iPhone') !== false ) {
+        if (stripos($this->_agent, 'iPhone') !== false) {
             $this->setVersion(self::VERSION_UNKNOWN);
             $this->setBrowser(self::BROWSER_IPHONE);
             $this->getSafariVersionOnIos();
@@ -1090,7 +1090,7 @@ 
      * @return boolean True if the browser is iPad otherwise false
      */
     protected function checkBrowseriPad() {
-        if( stripos($this->_agent,'iPad') !== false ) {
+        if (stripos($this->_agent, 'iPad') !== false) {
             $this->setVersion(self::VERSION_UNKNOWN);
             $this->setBrowser(self::BROWSER_IPAD);
             $this->getSafariVersionOnIos();
@@ -1107,7 +1107,7 @@ 
      * @return boolean True if the browser is iPod otherwise false
      */
     protected function checkBrowseriPod() {
-        if( stripos($this->_agent,'iPod') !== false ) {
+        if (stripos($this->_agent, 'iPod') !== false) {
             $this->setVersion(self::VERSION_UNKNOWN);
             $this->setBrowser(self::BROWSER_IPOD);
             $this->getSafariVersionOnIos();

Braces +16 added lines, -32 removed lines

@@ -1152,68 +1152,52 @@
         if (stripos($this->_agent, 'windows') !== false)
         {
             $this->_platform = self::PLATFORM_WINDOWS;
-        }
-        else if (stripos($this->_agent, 'iPad') !== false)
+        } else if (stripos($this->_agent, 'iPad') !== false)
         {
             $this->_platform = self::PLATFORM_IPAD;
-        }
-        else if (stripos($this->_agent, 'iPod') !== false)
+        } else if (stripos($this->_agent, 'iPod') !== false)
         {
             $this->_platform = self::PLATFORM_IPOD;
-        }
-        else if (stripos($this->_agent, 'iPhone') !== false)
+        } else if (stripos($this->_agent, 'iPhone') !== false)
         {
             $this->_platform = self::PLATFORM_IPHONE;
-        }
-        elseif (stripos($this->_agent, 'mac') !== false)
+        } elseif (stripos($this->_agent, 'mac') !== false)
         {
             $this->_platform = self::PLATFORM_APPLE;
-        }
-        elseif (stripos($this->_agent, 'android') !== false)
+        } elseif (stripos($this->_agent, 'android') !== false)
         {
             $this->_platform = self::PLATFORM_ANDROID;
-        }
-        elseif (stripos($this->_agent, 'linux') !== false)
+        } elseif (stripos($this->_agent, 'linux') !== false)
         {
             $this->_platform = self::PLATFORM_LINUX;
-        }
-        else if (stripos($this->_agent, 'Nokia') !== false)
+        } else if (stripos($this->_agent, 'Nokia') !== false)
         {
             $this->_platform = self::PLATFORM_NOKIA;
-        }
-        else if (stripos($this->_agent, 'BlackBerry') !== false)
+        } else if (stripos($this->_agent, 'BlackBerry') !== false)
         {
             $this->_platform = self::PLATFORM_BLACKBERRY;
-        }
-        elseif (stripos($this->_agent, 'FreeBSD') !== false)
+        } elseif (stripos($this->_agent, 'FreeBSD') !== false)
         {
             $this->_platform = self::PLATFORM_FREEBSD;
-        }
-        elseif (stripos($this->_agent, 'OpenBSD') !== false)
+        } elseif (stripos($this->_agent, 'OpenBSD') !== false)
         {
             $this->_platform = self::PLATFORM_OPENBSD;
-        }
-        elseif (stripos($this->_agent, 'NetBSD') !== false)
+        } elseif (stripos($this->_agent, 'NetBSD') !== false)
         {
             $this->_platform = self::PLATFORM_NETBSD;
-        }
-        elseif (stripos($this->_agent, 'OpenSolaris') !== false)
+        } elseif (stripos($this->_agent, 'OpenSolaris') !== false)
         {
             $this->_platform = self::PLATFORM_OPENSOLARIS;
-        }
-        elseif (stripos($this->_agent, 'SunOS') !== false)
+        } elseif (stripos($this->_agent, 'SunOS') !== false)
         {
             $this->_platform = self::PLATFORM_SUNOS;
-        }
-        elseif (stripos($this->_agent, 'OS\/2') !== false)
+        } elseif (stripos($this->_agent, 'OS\/2') !== false)
         {
             $this->_platform = self::PLATFORM_OS2;
-        }
-        elseif (stripos($this->_agent, 'BeOS') !== false)
+        } elseif (stripos($this->_agent, 'BeOS') !== false)
         {
             $this->_platform = self::PLATFORM_BEOS;
-        }
-        elseif (stripos($this->_agent, 'win') !== false)
+        } elseif (stripos($this->_agent, 'win') !== false)
         {
             $this->_platform = self::PLATFORM_WINDOWS;
         }