chamilo / chamilo-lms

main/exercise/showinframes.php

Indentation +3 added lines, -3 removed lines

@@ -28,10 +28,10 @@
 $content = ReadFileCont($full_file_path.$user_id.'.t.html');
 
 if ($content == '') {
-	$content = ReadFileCont($full_file_path);
+    $content = ReadFileCont($full_file_path);
     // Do not move this like:
-	$mit = "function Finish(){";
-	$js_content = "
+    $mit = "function Finish(){";
+    $js_content = "
     // Code added - start
     var SaveScoreVariable = 0;
     function mySaveScore() {

Spacing +6 added lines, -6 removed lines

@@ -14,8 +14,8 @@ 
 $time = time();
 $doc_url = str_replace(array('../', '\\', '\\0', '..'), array('', '', '', ''), urldecode($_GET['file']));
 $cid = api_get_course_id();
-$document_path = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document';
-$document_web_path = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document';
+$document_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$document_web_path = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document';
 $origin = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null;
 $learnpath_id = isset($_REQUEST['learnpath_id']) ? $_REQUEST['learnpath_id'] : null;
 $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? $_REQUEST['learnpath_item_id'] : null;
@@ -38,9 +38,9 @@ 
         if (SaveScoreVariable==0) {
             SaveScoreVariable = 1;
             if (C.ie) {
-                document.location.href = '" . api_get_path(WEB_CODE_PATH) . "exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score;
+                document.location.href = '" . api_get_path(WEB_CODE_PATH)."exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score;
             } else {
-                window.location.href = '" . api_get_path(WEB_CODE_PATH) . "exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score;
+                window.location.href = '" . api_get_path(WEB_CODE_PATH)."exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score;
             }
         }
     }
@@ -69,7 +69,7 @@ 
 $my_file = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($my_file));
 
 $title = GetQuizName($my_file, $documentPath);
-if ($title =='') {
+if ($title == '') {
     $title = basename($my_file);
 }
 $nameTools = $title;
@@ -86,7 +86,7 @@ 
     });
 </script>';
 
-$interbreadcrumb[]= array ("url"=>"./exercise.php", "name"=> get_lang('Exercises'));
+$interbreadcrumb[] = array("url"=>"./exercise.php", "name"=> get_lang('Exercises'));
 if ($origin == 'learnpath') {
     Display::display_reduced_header($nameTools, "Exercise");
 } else {

main/exercise/freeanswer.class.php

Spacing +2 added lines, -2 removed lines

@@ -60,9 +60,9 @@
             $score['revised'] = false;
         }
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="' . $this->question_table_class . '" >
+        $header .= '<table class="'.$this->question_table_class.'" >
         <tr>
-        <th>' . get_lang("Answer") . '</th>
+        <th>' . get_lang("Answer").'</th>
         </tr>';
 
         return $header;

main/exercise/export/aiken/aiken_classes.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@ 
  * @package chamilo.exercise
  */
 
-if ( count( get_included_files() ) == 1 ) die( '---' );
+if (count(get_included_files()) == 1) die('---');
 
 if (!function_exists('mime_content_type')) {
 	function mime_content_type($filename) {
-		return DocumentManager::file_get_mime_type((string)$filename);
+		return DocumentManager::file_get_mime_type((string) $filename);
 	}
 }
 
@@ -25,7 +25,7 @@ 
      */
     function setAnswer()
     {
-        switch($this->type)
+        switch ($this->type)
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
  * @package chamilo.exercise
  */
 
-if ( count( get_included_files() ) == 1 ) die( '---' );
+if ( count( get_included_files() ) == 1 ) {
+    die( '---' );
+}
 
 if (!function_exists('mime_content_type')) {
 	function mime_content_type($filename) {

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@ 
 
 if (!function_exists('mime_content_type')) {
 
-	/**
-	 * @param string $filename
+    /**
+     * @param string $filename
      * @return string
-	 */
-	function mime_content_type($filename) {
-		return DocumentManager::file_get_mime_type((string)$filename);
-	}
+     */
+    function mime_content_type($filename) {
+        return DocumentManager::file_get_mime_type((string)$filename);
+    }
 }
 
 /**
@@ -34,7 +34,7 @@ 
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);
-            	return $answer;
+                return $answer;
             default :
                 $answer = null;
                 break;
@@ -43,11 +43,11 @@ 
     }
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 

main/exercise/export/aiken/aiken_import.inc.php

Indentation +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
             $correct_answer_index = array_search($matches[1], $answers_array);
             $exercise_info['question'][$question_index]['title'] = $matches[1];
         } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) {
-             //TAGS for chamilo >= 1.10
+                //TAGS for chamilo >= 1.10
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)

Braces +5 added lines, -3 removed lines

@@ -10,8 +10,9 @@ 
 /**
  * Security check
  */
-if (count(get_included_files()) == 1)
+if (count(get_included_files()) == 1) {
     die('---');
+}
 
 /**
  * Creates a temporary directory
@@ -21,8 +22,9 @@ 
  * @return string
  */
 function tempdir($dir, $prefix = 'tmp', $mode = 0777) {
-    if (substr($dir, -1) != '/')
-        $dir .= '/';
+    if (substr($dir, -1) != '/') {
+            $dir .= '/';
+    }
 
     do {
         $path = $dir . $prefix . mt_rand(0, 9999999);

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
         $dir .= '/';
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -39,8 +39,8 @@ 
 {
     $name_tools = get_lang('ImportAikenQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="exercise.php?show=test&'.api_get_cidreq().'">' .
-        Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $form .= '<a href="exercise.php?show=test&'.api_get_cidreq().'">'.
+        Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $form_validator = new FormValidator(
         'aiken_upload',
@@ -93,7 +93,7 @@ 
 function aiken_import_exercise($file)
 {
     global $exercise_info;
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'aiken';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -130,9 +130,9 @@ 
 
     // Parse every subdirectory to search txt question files
     while (false !== ($file = readdir($exerciseHandle))) {
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
             //find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.txt$/i', $questionFile)) {
                     $result = aiken_parse_file(
@@ -216,7 +216,7 @@ 
         }
 
         // Delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         $operation = $last_exercise_id;
     }
 
@@ -239,8 +239,8 @@ 
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!is_file($questionFilePath)) {
         return 'FileNotFound';
@@ -252,13 +252,13 @@ 
     $answers_array = array();
     $new_question = true;
     foreach ($data as $line => $info) {
-        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/',$info)) {
+        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/', $info)) {
             // double empty line
             continue;
         }
         $new_question = false;
         //make sure it is transformed from iso-8859-1 to utf-8 if in that form
-        if (!mb_check_encoding($info,'utf-8') && mb_check_encoding($info,'iso-8859-1')) {
+        if (!mb_check_encoding($info, 'utf-8') && mb_check_encoding($info, 'iso-8859-1')) {
             $info = utf8_encode($info);
         }
         $exercise_info['question'][$question_index]['type'] = 'MCUA';
@@ -290,7 +290,7 @@ 
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
-        } elseif (preg_match('/^(\r)?\n/',$info)) {
+        } elseif (preg_match('/^(\r)?\n/', $info)) {
             //moving to next question (tolerate \r\n or just \n)
             if (empty($exercise_info['question'][$question_index]['correct_answers'])) {
                 error_log('Aiken: Error in question index '.$question_index.': no correct answer defined');
@@ -310,7 +310,7 @@ 
                     $exercise_info['question'][$question_index]['title'] = $info;
                 } else {
                     //Question itself (use a 100-chars long title and a larger description)
-                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)) . '...';
+                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)).'...';
                     $exercise_info['question'][$question_index]['description'] = $info;
                 }
             } else {
@@ -320,7 +320,7 @@ 
     }
     $total_questions = count($exercise_info['question']);
     $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20;
-    foreach  ($exercise_info['question'] as $key => $question) {
+    foreach ($exercise_info['question'] as $key => $question) {
         $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions;
     }
     return true;

main/exercise/export/exercise_import.php

Indentation +3 added lines, -3 removed lines

@@ -74,10 +74,10 @@
 Display::display_introduction_section(
     TOOL_QUIZ,
     array(
-		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
+        'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
         'CreateDocumentDir' => '../../..'.api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/',
-		'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
-	)
+        'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
+    )
 );
 
 // Display Forms or dialog box(if needed)

Spacing +8 added lines, -8 removed lines

@@ -29,22 +29,22 @@ 
 $interbredcrump[] = array('url' => '../exercise.php', 'name' => get_lang('Exercises'));
 
 // EXECUTE COMMAND
-$cmd = (isset($_REQUEST['cmd'])? $_REQUEST['cmd'] : 'show_import');
+$cmd = (isset($_REQUEST['cmd']) ? $_REQUEST['cmd'] : 'show_import');
 
 switch ($cmd) {
     case 'show_import' :
     {
         $display = '<p>'
-        .            get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.') . '<br>'
+        .            get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.').'<br>'
         .            '</p>'
         .            '<form enctype="multipart/form-data" action="" method="post">'
         .            '<input name="cmd" type="hidden" value="import" />'
         .            '<input name="uploadedExercise" type="file" /><br><br>'
-        .            get_lang('Import exercise') . ' : '
-        .            '<input value="' . get_lang('Ok') . '" type="submit" /> '
-        .            claro_html_button( $_SERVER['PHP_SELF'], get_lang('Cancel'))
+        .            get_lang('Import exercise').' : '
+        .            '<input value="'.get_lang('Ok').'" type="submit" /> '
+        .            claro_html_button($_SERVER['PHP_SELF'], get_lang('Cancel'))
         .            '<br><br>'
-        .            '<small>' . get_lang('Max file size') . ' :  2&nbsp;MB</small>'
+        .            '<small>'.get_lang('Max file size').' :  2&nbsp;MB</small>'
         .            '</form>';
     }
     break;
@@ -67,7 +67,7 @@ 
 
 
 // DISPLAY
-include api_get_path(SYS_INC_PATH) . '/header.inc.php';
+include api_get_path(SYS_INC_PATH).'/header.inc.php';
 
 // Tool introduction
 // TODO: These settings to be checked when it is possible.
@@ -91,4 +91,4 @@ 
     echo $display;
 }
 
-include api_get_path(SYS_INC_PATH) . '/footer.inc.php';
+include api_get_path(SYS_INC_PATH).'/footer.inc.php';

main/exercise/export/qti2/qti2_export.php

Spacing +23 added lines, -23 removed lines

@@ -8,7 +8,7 @@ 
 /**
  * Code
  */
-require dirname(__FILE__) . '/qti2_classes.php';
+require dirname(__FILE__).'/qti2_classes.php';
 /**
  * Classes
 */
@@ -38,7 +38,7 @@ 
      {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
      }
 
      /**
@@ -73,7 +73,7 @@ 
       */
      function start_item_body()
      {
-        return '  <itemBody>' . "\n";
+        return '  <itemBody>'."\n";
      }
 
      /**
@@ -92,7 +92,7 @@ 
 
       function add_response_processing()
       {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>'."\n";
       }
 
      /**
@@ -108,7 +108,7 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'."\n";
         }
         //TODO understand why answer might be a non-object sometimes
         if (!is_object($this->answer)) {
@@ -164,7 +164,7 @@ 
 
     function start_section()
     {
-        $out = '<section ident="EXO_' . $this->exercise->selectId() . '" title="' .cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())) . '">' . "\n";
+        $out = '<section ident="EXO_'.$this->exercise->selectId().'" title="'.cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())).'">'."\n";
         return $out;
     }
 
@@ -180,7 +180,7 @@ 
             // return exercise duration in ISO8601 format.
             $minutes = floor($max_time / 60);
             $seconds = $max_time % 60;
-            return '<duration>PT' . $minutes . 'M' . $seconds . "S</duration>\n";
+            return '<duration>PT'.$minutes.'M'.$seconds."S</duration>\n";
         } else {
             return '';
         }
@@ -193,7 +193,7 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+             . "  <mattext><![CDATA[".formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
              . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
@@ -207,14 +207,14 @@ 
     {
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
-            $out.= "<selection_ordering>"
+            $out .= "<selection_ordering>"
                  . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
+                 . "    <selection_number>".$n."</selection_number>\n"
                  . "  </selection>\n"
                  . '  <order order_type="Random" />'
                  . "\n</selection_ordering>\n";
         } else {
-            $out.= '<selection_ordering sequence_type="Normal">' . "\n"
+            $out .= '<selection_ordering sequence_type="Normal">'."\n"
                  . "  <selection />\n"
                  . "</selection_ordering>\n";
         }
@@ -246,8 +246,8 @@ 
     {
         $head = $foot = "";
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -308,7 +308,7 @@ 
      {
         $this->question = $question;
         $this->answer = $question->answer;
-        $this->questionIdent = "QST_" . $question->selectId() ;
+        $this->questionIdent = "QST_".$question->selectId();
      }
 
      /**
@@ -320,7 +320,7 @@ 
       */
       function start_item()
       {
-        return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
+        return '<item title="'.cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())).'" ident="'.$this->questionIdent.'">'."\n";
       }
 
       /**
@@ -343,8 +343,8 @@ 
       */
      function start_presentation()
      {
-        return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        return '<presentation label="'.$this->questionIdent.'"><flow>'."\n"
+             . '<material><mattext>'.formatExerciseQtiDescription($this->question->selectDescription())."</mattext></material>\n";
      }
 
      /**
@@ -364,7 +364,7 @@ 
       */
      function start_processing()
      {
-        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
+        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>'."\n";
      }
 
      /**
@@ -392,8 +392,8 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -447,9 +447,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+	$question->weighting = $qst->weighting;
+	$question->position = $qst->position;
+	$question->picture = $qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

Indentation +159 added lines, -159 removed lines

@@ -34,21 +34,21 @@ 
      *
      * @param Ims2Question $question Ims2Question object we want to export.
      */
-     function __construct($question)
-     {
+        function __construct($question)
+        {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
         $this->questionIdent = "QST_" . $question->id ;
-     }
-
-     /**
-      * Start the XML flow.
-      *
-      * This opens the <item> block, with correct attributes.
-      *
-      */
-      function start_item()
-      {
+        }
+
+        /**
+         * Start the XML flow.
+         *
+         * This opens the <item> block, with correct attributes.
+         *
+         */
+        function start_item()
+        {
         $string = '<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p1"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p1 imsqti_v2p1.xsd"
@@ -56,55 +56,55 @@ 
                     title="'.htmlspecialchars(formatExerciseQtiTitle($this->question->selectTitle())).'">'."\n";
 
         return $string;
-      }
-
-      /**
-       * End the XML flow, closing the </item> tag.
-       *
-       */
-      function end_item()
-      {
+        }
+
+        /**
+         * End the XML flow, closing the </item> tag.
+         *
+         */
+        function end_item()
+        {
         return "</assessmentItem>\n";
-      }
-
-     /**
-      * Start the itemBody
-      *
-      */
-     function start_item_body()
-     {
+        }
+
+        /**
+         * Start the itemBody
+         *
+         */
+        function start_item_body()
+        {
         return '  <itemBody>' . "\n";
-     }
-
-     /**
-      * End the itemBody part.
-      *
-      */
-     function end_item_body()
-     {
+        }
+
+        /**
+         * End the itemBody part.
+         *
+         */
+        function end_item_body()
+        {
         return "  </itemBody>\n";
-     }
-
-     /**
-      * add the response processing template used.
-      *
-      */
-
-      function add_response_processing()
-      {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
-      }
-
-     /**
-      * Export the question as an IMS/QTI Item.
-      *
-      * This is a default behaviour, some classes may want to override this.
-      *
-      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return string string, the XML flow for an Item.
-      */
-     function export($standalone = false)
-     {
+        }
+
+        /**
+         * add the response processing template used.
+         *
+         */
+
+        function add_response_processing()
+        {
+            return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+        }
+
+        /**
+         * Export the question as an IMS/QTI Item.
+         *
+         * This is a default behaviour, some classes may want to override this.
+         *
+         * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+         * @return string string, the XML flow for an Item.
+         */
+        function export($standalone = false)
+        {
         $head = $foot = "";
 
         if ($standalone) {
@@ -131,7 +131,7 @@ 
             .$foot;
 
         return $res;
-     }
+        }
 }
 
 /**
@@ -194,8 +194,8 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
-             . "</material></flow_mat></presentation_material>\n";
+                . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+                . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
 
@@ -209,15 +209,15 @@ 
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
             $out.= "<selection_ordering>"
-                 . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
-                 . "  </selection>\n"
-                 . '  <order order_type="Random" />'
-                 . "\n</selection_ordering>\n";
+                    . "  <selection>\n"
+                    . "    <selection_number>" . $n . "</selection_number>\n"
+                    . "  </selection>\n"
+                    . '  <order order_type="Random" />'
+                    . "\n</selection_ordering>\n";
         } else {
             $out.= '<selection_ordering sequence_type="Normal">' . "\n"
-                 . "  <selection />\n"
-                 . "</selection_ordering>\n";
+                    . "  <selection />\n"
+                    . "</selection_ordering>\n";
         }
 
         return $out;
@@ -231,7 +231,7 @@ 
     {
         $out = "";
         foreach ($this->exercise->selectQuestionList() as $q) {
-        	$out .= export_question_qti($q, false);
+            $out .= export_question_qti($q, false);
         }
         return $out;
     }
@@ -248,18 +248,18 @@ 
         $head = $foot = "";
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
-                  . "<questestinterop>\n";
+                    . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+                    . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
         $out = $head
-             . $this->start_section()
-             . $this->export_duration()
-             . $this->export_presentation()
-             . $this->export_ordering()
-             . $this->export_questions()
-             . $this->end_section()
-             . $foot;
+                . $this->start_section()
+                . $this->export_duration()
+                . $this->export_presentation()
+                . $this->export_ordering()
+                . $this->export_questions()
+                . $this->end_section()
+                . $foot;
 
         return $out;
     }
@@ -306,97 +306,97 @@ 
      * @return ImsItem
      * @author Anamd Tihon
      */
-     function __construct($question)
-     {
+        function __construct($question)
+        {
         $this->question = $question;
         $this->answer = $question->answer;
         $this->questionIdent = "QST_" . $question->selectId() ;
-     }
-
-     /**
-      * Start the XML flow.
-      *
-      * This opens the <item> block, with correct attributes.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-      function start_item()
-      {
+        }
+
+        /**
+         * Start the XML flow.
+         *
+         * This opens the <item> block, with correct attributes.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_item()
+        {
         return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
-      }
-
-      /**
-       * End the XML flow, closing the </item> tag.
-       *
-       * @author Amand Tihon <amand@alrj.org>
-       */
-      function end_item()
-      {
+        }
+
+        /**
+         * End the XML flow, closing the </item> tag.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_item()
+        {
         return "</item>\n";
-      }
-
-     /**
-      * Create the opening, with the question itself.
-      *
-      * This means it opens the <presentation> but doesn't close it, as this is the role of end_presentation().
-      * In between, the export_responses from the subclass should have been called.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function start_presentation()
-     {
+        }
+
+        /**
+         * Create the opening, with the question itself.
+         *
+         * This means it opens the <presentation> but doesn't close it, as this is the role of end_presentation().
+         * In between, the export_responses from the subclass should have been called.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_presentation()
+        {
         return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
-     }
-
-     /**
-      * End the </presentation> part, opened by export_header.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function end_presentation()
-     {
+                . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        }
+
+        /**
+         * End the </presentation> part, opened by export_header.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_presentation()
+        {
         return "</flow></presentation>\n";
-     }
-
-     /**
-      * Start the response processing, and declare the default variable, SCORE, at 0 in the outcomes.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function start_processing()
-     {
+        }
+
+        /**
+         * Start the response processing, and declare the default variable, SCORE, at 0 in the outcomes.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_processing()
+        {
         return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
-     }
-
-     /**
-      * End the response processing part.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function end_processing()
-     {
+        }
+
+        /**
+         * End the response processing part.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_processing()
+        {
         return "</resprocessing>\n";
-     }
-
-     /**
-      * Export the question as an IMS/QTI Item.
-      *
-      * This is a default behaviour, some classes may want to override this.
-      *
-      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return string string, the XML flow for an Item.
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function export($standalone = False)
-     {
+        }
+
+        /**
+         * Export the question as an IMS/QTI Item.
+         *
+         * This is a default behaviour, some classes may want to override this.
+         *
+         * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+         * @return string string, the XML flow for an Item.
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function export($standalone = False)
+        {
         global $charset;
         $head = $foot = "";
 
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
-                  . "<questestinterop>\n";
+                    . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+                    . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
 
@@ -411,7 +411,7 @@ 
             . $this->answer->imsExportFeedback($this->questionIdent)
             . $this->end_item()
             . $foot;
-     }
+        }
 }
 
 /**
@@ -450,9 +450,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+    $question->weighting=$qst->weighting;
+    $question->position=$qst->position;
+    $question->picture=$qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

main/exercise/Hpdownload.php

Spacing +35 added lines, -35 removed lines

@@ -12,12 +12,12 @@ 
 session_cache_limiter('public');
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 $tbl_document = Database::get_course_table(TABLE_DOCUMENT);
 
-$doc_url=str_replace(array('../','\\..','\\0','..\\'),array('','','',''),urldecode($_GET['doc_url']));
-$filename=basename($doc_url);
+$doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($_GET['doc_url']));
+$filename = basename($doc_url);
 
 // launch event
 //Event::event_download($doc_url);
@@ -29,7 +29,7 @@ 
 	$full_file_name = $course_path.Security::remove_XSS($doc_url);
 }
 
-if(!is_file($full_file_name)) {
+if (!is_file($full_file_name)) {
 	exit;
 }
 
@@ -37,26 +37,26 @@ 
     exit;
 }
 
-$extension=explode('.',$filename);
-$extension=strtolower($extension[sizeof($extension)-1]);
-
-switch($extension) {
-	case 'gz':		$content_type='application/x-gzip';			break;
-	case 'zip':		$content_type='application/zip';			break;
-	case 'pdf':		$content_type='application/pdf';			break;
-	case 'png':		$content_type='image/png';					break;
-	case 'gif':		$content_type='image/gif';					break;
-	case 'jpg':		$content_type='image/jpeg';					break;
-	case 'txt':		$content_type='text/plain';					break;
-	case 'htm':		$content_type='text/html';					break;
-	case 'html':	$content_type='text/html';					break;
-	default:		$content_type='application/octet-stream';	break;
+$extension = explode('.', $filename);
+$extension = strtolower($extension[sizeof($extension) - 1]);
+
+switch ($extension) {
+	case 'gz':		$content_type = 'application/x-gzip'; break;
+	case 'zip':		$content_type = 'application/zip'; break;
+	case 'pdf':		$content_type = 'application/pdf'; break;
+	case 'png':		$content_type = 'image/png'; break;
+	case 'gif':		$content_type = 'image/gif'; break;
+	case 'jpg':		$content_type = 'image/jpeg'; break;
+	case 'txt':		$content_type = 'text/plain'; break;
+	case 'htm':		$content_type = 'text/html'; break;
+	case 'html':	$content_type = 'text/html'; break;
+	default:		$content_type = 'application/octet-stream'; break;
 }
 
 header('Content-disposition: filename='.$filename);
 header('Content-Type: '.$content_type);
-header('Expires: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT');
 
 /*
 	Dynamic parsing section
@@ -70,16 +70,16 @@ 
 if ($content_type == 'text/html') {
 	$directory_name = dirname($full_file_name);
 
-	$dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
+	$dir = str_replace(array('\\', $_configuration['root_sys']."courses/".$_course['path'].'/document'), array('/', ''), $directory_name);
 
-	if($dir[strlen($dir)-1] != '/') {
-		$dir.='/';
+	if ($dir[strlen($dir) - 1] != '/') {
+		$dir .= '/';
 	}
 
 
 	//Parse whole file at one
 	$fp = fopen($full_file_name, "r");
-	$file_content = fread ($fp, filesize ($full_file_name));
+	$file_content = fread($fp, filesize($full_file_name));
 	fclose($fp);
 	//$file_content = api_replace_parameter($dir, $file_content, "src");
 	//$file_content = api_replace_parameter($dir, $file_content, "href");
@@ -98,9 +98,9 @@ 
 
 
     $exercisePath = api_get_self();
-  	$exfile = explode('/',$exercisePath);
-  	$exfile = $exfile[sizeof($exfile)-1];
-  	$exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
+  	$exfile = explode('/', $exercisePath);
+  	$exfile = $exfile[sizeof($exfile) - 1];
+  	$exercisePath = substr($exercisePath, 0, strpos($exercisePath, $exfile));
   	$exercisePath = $exercisePath;
 
 		$content = $file_content;
@@ -125,16 +125,16 @@ 
 "// Must be included \n".
 "function Finish(){\n".
 " mySaveScore();";
-		$newcontent = str_replace($mit,$js_content,$content);
+		$newcontent = str_replace($mit, $js_content, $content);
 
-		$prehref="javascript:void(0);";
-		$posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+		$prehref = "javascript:void(0);";
+		$posthref = api_get_path(WEB_CODE_PATH)."main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+		$newcontent = str_replace($prehref, $posthref, $newcontent);
 
 
-		$prehref="class=\"GridNum\" onclick=";
-		$posthref="class=\"GridNum\" onMouseover=";
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+		$prehref = "class=\"GridNum\" onclick=";
+		$posthref = "class=\"GridNum\" onMouseover=";
+		$newcontent = str_replace($prehref, $posthref, $newcontent);
 
 
 		header('Content-length: '.strlen($newcontent));
@@ -146,7 +146,7 @@ 
 
 //normal case, all non-html files
 //header('Content-length: '.filesize($full_file_name));
-$fp=fopen($full_file_name,'rb');
+$fp = fopen($full_file_name, 'rb');
 fpassthru($fp);
 fclose($fp);
 ?>

Indentation +41 added lines, -41 removed lines

@@ -23,14 +23,14 @@ 
 //Event::event_download($doc_url);
 if (isset($_course['path'])) {
     $course_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-	$full_file_name = $course_path.Security::remove_XSS($doc_url);
+    $full_file_name = $course_path.Security::remove_XSS($doc_url);
 } else {
     $course_path = api_get_path(SYS_COURSE_PATH).$cid.'/document';
-	$full_file_name = $course_path.Security::remove_XSS($doc_url);
+    $full_file_name = $course_path.Security::remove_XSS($doc_url);
 }
 
 if(!is_file($full_file_name)) {
-	exit;
+    exit;
 }
 
 if (!Security::check_abs_path($full_file_name, $course_path.'/')) {
@@ -41,16 +41,16 @@ 
 $extension=strtolower($extension[sizeof($extension)-1]);
 
 switch($extension) {
-	case 'gz':		$content_type='application/x-gzip';			break;
-	case 'zip':		$content_type='application/zip';			break;
-	case 'pdf':		$content_type='application/pdf';			break;
-	case 'png':		$content_type='image/png';					break;
-	case 'gif':		$content_type='image/gif';					break;
-	case 'jpg':		$content_type='image/jpeg';					break;
-	case 'txt':		$content_type='text/plain';					break;
-	case 'htm':		$content_type='text/html';					break;
-	case 'html':	$content_type='text/html';					break;
-	default:		$content_type='application/octet-stream';	break;
+    case 'gz':		$content_type='application/x-gzip';			break;
+    case 'zip':		$content_type='application/zip';			break;
+    case 'pdf':		$content_type='application/pdf';			break;
+    case 'png':		$content_type='image/png';					break;
+    case 'gif':		$content_type='image/gif';					break;
+    case 'jpg':		$content_type='image/jpeg';					break;
+    case 'txt':		$content_type='text/plain';					break;
+    case 'htm':		$content_type='text/html';					break;
+    case 'html':	$content_type='text/html';					break;
+    default:		$content_type='application/octet-stream';	break;
 }
 
 header('Content-disposition: filename='.$filename);
@@ -68,30 +68,30 @@ 
 */
 
 if ($content_type == 'text/html') {
-	$directory_name = dirname($full_file_name);
+    $directory_name = dirname($full_file_name);
 
-	$dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
+    $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
 
-	if($dir[strlen($dir)-1] != '/') {
-		$dir.='/';
-	}
+    if($dir[strlen($dir)-1] != '/') {
+        $dir.='/';
+    }
 
 
-	//Parse whole file at one
-	$fp = fopen($full_file_name, "r");
-	$file_content = fread ($fp, filesize ($full_file_name));
-	fclose($fp);
+    //Parse whole file at one
+    $fp = fopen($full_file_name, "r");
+    $file_content = fread ($fp, filesize ($full_file_name));
+    fclose($fp);
     $exercisePath = api_get_self();
-  	$exfile = explode('/',$exercisePath);
-  	$exfile = $exfile[sizeof($exfile)-1];
-  	$exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
-  	$exercisePath = $exercisePath;
+        $exfile = explode('/',$exercisePath);
+        $exfile = $exfile[sizeof($exfile)-1];
+        $exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
+        $exercisePath = $exercisePath;
 
-		$content = $file_content;
-		$mit = "function Finish(){";
+        $content = $file_content;
+        $mit = "function Finish(){";
 
-		$js_content = "var SaveScoreVariable = 0; // This variable included by Dokeos System\n".
-		"function mySaveScore() // This function included by Dokeos System\n".
+        $js_content = "var SaveScoreVariable = 0; // This variable included by Dokeos System\n".
+        "function mySaveScore() // This function included by Dokeos System\n".
 "{\n".
 "   if (SaveScoreVariable==0)\n".
 "		{\n".
@@ -109,23 +109,23 @@ 
 "// Must be included \n".
 "function Finish(){\n".
 " mySaveScore();";
-		$newcontent = str_replace($mit,$js_content,$content);
+        $newcontent = str_replace($mit,$js_content,$content);
 
-		$prehref="javascript:void(0);";
-		$posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+        $prehref="javascript:void(0);";
+        $posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+        $newcontent = str_replace($prehref,$posthref,$newcontent);
 
 
-		$prehref="class=\"GridNum\" onclick=";
-		$posthref="class=\"GridNum\" onMouseover=";
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+        $prehref="class=\"GridNum\" onclick=";
+        $posthref="class=\"GridNum\" onMouseover=";
+        $newcontent = str_replace($prehref,$posthref,$newcontent);
 
 
-		header('Content-length: '.strlen($newcontent));
-		// Dipsp.
-		echo $newcontent;
+        header('Content-length: '.strlen($newcontent));
+        // Dipsp.
+        echo $newcontent;
 
-	exit();
+    exit();
 }
 
 //normal case, all non-html files

main/exercise/exercise_submit.php

Braces +32 added lines, -12 removed lines

@@ -269,7 +269,9 @@ 
 $clock_expired_time = null;
 
 if (empty($exercise_stat_info)) {
-    if ($debug)  error_log('5  $exercise_stat_info is empty ');
+    if ($debug) {
+        error_log('5  $exercise_stat_info is empty ');
+    }
 	$total_weight = 0;
 	$questionList = $objExercise->get_validated_question_list();
 	foreach ($questionListUncompressed as $question_id) {
@@ -280,11 +282,17 @@ 
 	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);
+		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;
@@ -304,8 +312,10 @@ 
         $learnpath_item_id,
         $learnpath_item_view_id
     );
-    if ($debug)  error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
-} else {
+    if ($debug) {
+        error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
+    }
+    } else {
 	$exe_id = $exercise_stat_info['exe_id'];
     // Remember last question id position.
     $isFirstTime = Session::read('firstTime');
@@ -327,8 +337,10 @@ 
         }
     }
 
-    if ($debug)  error_log("5  exercise_stat_info[] exists getting exe_id $exe_id ");
-}
+    if ($debug) {
+        error_log("5  exercise_stat_info[] exists getting exe_id $exe_id ");
+    }
+    }
 
 $questionListInSession = Session::read('questionList');
 
@@ -384,9 +396,15 @@ 
  * 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
@@ -473,7 +491,9 @@ 
 	}
 }
 
-if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
+if ($debug) {
+    error_log('8. Question list loaded '.print_r($questionList, 1));
+}
 
 //Real question count
 $question_count = 0;

Indentation +188 added lines, -188 removed lines

@@ -123,7 +123,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 {
@@ -136,13 +136,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;
 }
@@ -164,7 +164,7 @@ 
 
 $time_control = false;
 if ($objExercise->expired_time != 0) {
-	$time_control = true;
+    $time_control = true;
 }
 
 // Generating the time control key for the user
@@ -173,14 +173,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,
@@ -189,9 +189,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
@@ -230,31 +230,31 @@ 
                             $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(get_lang('Exercises'));
-		}
+        if ($origin == 'learnpath') {
+            Display :: display_reduced_header();
+        } else {
+            Display :: display_header(get_lang('Exercises'));
+        }
 
-		echo $attempt_html;
+        echo $attempt_html;
 
         if ($origin != 'learnpath') {
             Display:: display_footer();
         }
-		exit;
-	}
+        exit;
+    }
 }
 
 if ($debug) {
@@ -278,26 +278,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,
@@ -314,7 +314,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) {
@@ -373,9 +373,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();
@@ -383,8 +383,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;
 }
 
 /*
@@ -392,56 +392,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];
@@ -458,7 +458,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
@@ -471,14 +471,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));
@@ -486,7 +486,7 @@ 
 //Real question count
 $question_count = 0;
 if (!empty($questionList)) {
-	$question_count = count($questionList);
+    $question_count = count($questionList);
 }
 
 if ($current_question > $question_count) {
@@ -532,11 +532,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));
                         }
@@ -627,58 +627,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') {
@@ -717,9 +717,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>';
 }
@@ -762,7 +762,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 {
@@ -777,7 +777,7 @@ 
 if (isset($_custom['exercises_hidden_when_no_start_date']) &&
     $_custom['exercises_hidden_when_no_start_date']
 ) {
-	if (empty($objExercise->start_time)) {
+    if (empty($objExercise->start_time)) {
         Display:: display_warning_message(
             sprintf(
                 get_lang('ExerciseNoStartedYet'),
@@ -785,20 +785,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)  {
@@ -810,53 +810,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)) {
@@ -1096,7 +1096,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)) {
@@ -1156,10 +1156,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
@@ -1233,8 +1233,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 @@ 
 */
 
 require_once __DIR__.'/../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,14 +60,14 @@ 
 $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>';
 
 if (api_get_setting('enable_record_audio') === 'true') {
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'rtc/RecordRTC.js"></script>';
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/recorder.js"></script>';
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/gui.js"></script>';
-    $htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'rtc/RecordRTC.js"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/recorder.js"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/gui.js"></script>';
+    $htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'swfobject/swfobject.js"></script>';
 }
 
 $template = new Template();
@@ -76,7 +76,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;
@@ -103,7 +103,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');
 }
 
@@ -174,7 +174,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;
@@ -191,7 +191,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
@@ -221,7 +221,7 @@ 
                     );
 
                     if (!empty($last_attempt_info['question_list'])) {
-                        foreach($last_attempt_info['question_list'] as $questions) {
+                        foreach ($last_attempt_info['question_list'] as $questions) {
                             foreach ($questions as $question_data) {
                                 $question_id = $question_data['question_id'];
                                 $marks       = $question_data['marks'];
@@ -232,7 +232,7 @@ 
                             }
                         }
                     }
-					$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);
@@ -293,12 +293,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(
@@ -412,22 +412,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
@@ -443,17 +443,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
@@ -506,7 +506,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 => '');
     }
 
@@ -540,7 +540,7 @@ 
                     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));
+                            error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice, 1));
                         }
                         $objExercise->manage_answer(
                             $exe_id,
@@ -560,13 +560,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) {
@@ -692,15 +692,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 {
@@ -719,9 +719,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>';
 }
@@ -760,7 +760,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') {
@@ -803,7 +803,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'];
@@ -814,14 +814,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
@@ -833,8 +833,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
@@ -865,7 +865,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;
@@ -896,7 +896,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>
@@ -910,7 +910,7 @@ 
                 ICON_SIZE_SMALL,
                 false,
                 true
-            ) . '\';
+            ).'\';
 
             // Block form submition on enter
             $(".block_on_enter").keypress(function(event) {
@@ -962,7 +962,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;
         }
 
@@ -994,7 +994,7 @@ 
 
             // Only for the first time
 
-            $("#save_for_now_"+question_id).html(\'' . Display::returnFontAwesomeIcon('spinner', null, true, 'fa-spin') . '\');
+            $("#save_for_now_"+question_id).html(\'' . Display::returnFontAwesomeIcon('spinner', null, true, 'fa-spin').'\');
             $.ajax({
                 type:"post",
                 async: false,
@@ -1002,9 +1002,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 ) {
@@ -1019,13 +1019,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;
@@ -1058,7 +1058,7 @@ 
 
             free_answers = $.param(free_answers);
 
-            $("#save_all_reponse").html(\'' . Display::returnFontAwesomeIcon('spinner', null, true, 'fa-spin') . '\');
+            $("#save_all_reponse").html(\'' . Display::returnFontAwesomeIcon('spinner', null, true, 'fa-spin').'\');
 
             $.ajax({
                 type:"post",
@@ -1067,14 +1067,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').'\');
                     }
                 }
             });
@@ -1087,16 +1087,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;
@@ -1105,7 +1105,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']);
     }
@@ -1153,7 +1153,7 @@ 
             $remind_highlight = 'no_remind_highlight';
         }
 
-        $exercise_actions  = '';
+        $exercise_actions = '';
         $is_remind_on = false;
 
         $attributes = array('id' =>'remind_list['.$questionId.']');
@@ -1165,8 +1165,8 @@ 
         }
 
         // Showing the exercise description
-        if (!empty($objExercise->description)){
-            if ($objExercise->type == ONE_PER_PAGE || ($objExercise->type != ONE_PER_PAGE && $i==1)) {
+        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,
@@ -1202,7 +1202,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;
         }
 
@@ -1212,13 +1212,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'));
@@ -1235,7 +1235,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/exercise/UniqueAnswerImage.php

Spacing +47 added lines, -47 removed lines

@@ -40,22 +40,22 @@ 
 
         if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
             //Scenario
-            $commentTitle = '<th>' . get_lang('Comment') . '</th>';
-            $feedbackTitle = '<th>' . get_lang('Scenario') . '</th>';
+            $commentTitle = '<th>'.get_lang('Comment').'</th>';
+            $feedbackTitle = '<th>'.get_lang('Scenario').'</th>';
         } else {
-            $commentTitle = '<th >' . get_lang('Comment') . '</th>';
+            $commentTitle = '<th >'.get_lang('Comment').'</th>';
         }
 
         $html = '<div class="alert alert-success" role="alert">'.get_lang('UniqueAnswerImagePreferredSize200x150').'</div>';
         $html .= '<table class="table table-striped table-hover">
             <thead>
                 <tr style="text-align: center;">
-                    <th width="10">' . get_lang('Number') . '</th>
-                    <th>' . get_lang('True') . '</th>
-                    <th>' . get_lang('Answer') . '</th>
-                        ' . $commentTitle . '
-                        ' . $feedbackTitle . '
-                    <th width="15">' . get_lang('Weighting') . '</th>
+                    <th width="10">' . get_lang('Number').'</th>
+                    <th>' . get_lang('True').'</th>
+                    <th>' . get_lang('Answer').'</th>
+                        ' . $commentTitle.'
+                        ' . $feedbackTitle.'
+                    <th width="15">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -90,7 +90,7 @@ 
                 }
 
                 $question = Question::read($questionid);
-                $selectQuestion[$questionid] = 'Q' . $key . ' :' . cut(
+                $selectQuestion[$questionid] = 'Q'.$key.' :'.cut(
                     $question->selectTitle(), 20
                 );
             }
@@ -123,9 +123,9 @@ 
                     $correct = $i;
                 }
 
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format(
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format(
                     $answer->weighting[$i], 1
                 );
 
@@ -148,18 +148,18 @@ 
                     $urlResult = $url;
                 }
 
-                $tempScenario['url' . $i] = $urlResult;
-                $tempScenario['try' . $i] = $tryResult;
-                $tempScenario['lp' . $i] = $lp;
-                $tempScenario['destination' . $i] = $listDestination;
+                $tempScenario['url'.$i] = $urlResult;
+                $tempScenario['try'.$i] = $tryResult;
+                $tempScenario['lp'.$i] = $lp;
+                $tempScenario['destination'.$i] = $listDestination;
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultUniqueAnswer1');
                 $defaults['weighting[1]'] = 10;
                 $defaults['answer[2]'] = get_lang('DefaultUniqueAnswer2');
                 $defaults['weighting[2]'] = 0;
 
-                $tempScenario['destination' . $i] = array('0');
-                $tempScenario['lp' . $i] = array('0');
+                $tempScenario['destination'.$i] = array('0');
+                $tempScenario['lp'.$i] = array('0');
             }
 
             $defaults['scenario'] = $tempScenario;
@@ -172,50 +172,50 @@ 
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'weighting[' . $i . ']'
+                'weighting['.$i.']'
             );
 
-            $answerNumber = $form->addElement('text', 'counter[' . $i . ']', null, ' value = "' . $i . '"');
+            $answerNumber = $form->addElement('text', 'counter['.$i.']', null, ' value = "'.$i.'"');
             $answerNumber->freeze();
 
             $form->addElement('radio', 'correct', null, null, $i, 'class="checkbox"');
-            $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editorConfig);
+            $form->addHtmlEditor('answer['.$i.']', null, null, true, $editorConfig);
 
-            $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
+            $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
             if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editorConfig);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editorConfig);
                 // Direct feedback
                 //Adding extra feedback fields
                 $group = array();
-                $group['try' . $i] = $form->createElement('checkbox', 'try' . $i, null, get_lang('TryAgain'));
-                $group['lp' . $i] = $form->createElement(
+                $group['try'.$i] = $form->createElement('checkbox', 'try'.$i, null, get_lang('TryAgain'));
+                $group['lp'.$i] = $form->createElement(
                     'select',
-                    'lp' . $i,
-                    get_lang('SeeTheory') . ': ',
+                    'lp'.$i,
+                    get_lang('SeeTheory').': ',
                     $selectLpId
                 );
-                $group['destination' . $i] = $form->createElement(
+                $group['destination'.$i] = $form->createElement(
                     'select',
-                    'destination' . $i,
-                    get_lang('GoToQuestion') . ': ',
+                    'destination'.$i,
+                    get_lang('GoToQuestion').': ',
                     $selectQuestion
                 );
-                $group['url' . $i] = $form->createElement(
-                    'text', 'url' . $i,
-                    get_lang('Other') . ': ',
+                $group['url'.$i] = $form->createElement(
+                    'text', 'url'.$i,
+                    get_lang('Other').': ',
                     array(
                         'class' => 'col-md-2',
                         'placeholder' => get_lang('Other')
@@ -228,9 +228,9 @@ 
                     'scenario'
                 );
             } else {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editorConfig);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editorConfig);
             }
-            $form->addText('weighting[' . $i . ']', null, null, array('class' => "col-md-1", 'value' => '0'));
+            $form->addText('weighting['.$i.']', null, null, array('class' => "col-md-1", 'value' => '0'));
             $form->addHtml('</tr>');
         }
 
@@ -279,19 +279,19 @@ 
         $numberAnswers = $form->getSubmitValue('nb_answers');
 
         for ($i = 1; $i <= $numberAnswers; $i++) {
-            $answer = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('answer[' . $i . ']')));
-            $comment = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('comment[' . $i . ']')));
-            $weighting = trim($form->getSubmitValue('weighting[' . $i . ']'));
+            $answer = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('answer['.$i.']')));
+            $comment = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('comment['.$i.']')));
+            $weighting = trim($form->getSubmitValue('weighting['.$i.']'));
 
             $scenario = $form->getSubmitValue('scenario');
 
             //$listDestination = $form -> getSubmitValue('destination'.$i);
             //$destinationStr = $form -> getSubmitValue('destination'.$i);
 
-            $try = $scenario['try' . $i];
-            $lp = $scenario['lp' . $i];
-            $destination = $scenario['destination' . $i];
-            $url = trim($scenario['url' . $i]);
+            $try = $scenario['try'.$i];
+            $lp = $scenario['lp'.$i];
+            $destination = $scenario['destination'.$i];
+            $url = trim($scenario['url'.$i]);
 
             /*
               How we are going to parse the destination value
@@ -340,7 +340,7 @@ 
             }
 
             //1@@1;2;@@2;4;4;@@http://www.chamilo.org
-            $dest = $try . '@@' . $lp . '@@' . $destination . '@@' . $url;
+            $dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
 
             $objAnswer->createAnswer($answer, $goodAnswer, $comment, $weighting, $i, null, null, $dest);
         }