chamilo / chamilo-lms

main/exercice/export/aiken/aiken_classes.php

Doc Comments +4 added lines

@@ -10,6 +10,10 @@
 if ( count( get_included_files() ) == 1 ) die( '---' );
 
 if (!function_exists('mime_content_type')) {
+
+	/**
+	 * @param string $filename
+	 */
 	function mime_content_type($filename) {
 		return DocumentManager::file_get_mime_type((string)$filename);
 	}

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 +6 added lines, -6 removed lines

@@ -10,9 +10,9 @@ 
 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);
-	}
+    function mime_content_type($filename) {
+        return DocumentManager::file_get_mime_type((string)$filename);
+    }
 }
 
 /**
@@ -29,7 +29,7 @@ 
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);
-            	return $answer;
+                return $answer;
             default :
                 $answer = null;
                 break;
@@ -38,11 +38,11 @@ 
     }
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 

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

Doc Comments +6 added lines, -1 removed lines

@@ -55,6 +55,8 @@ 
  * Gets the uploaded file (from $_FILES) and unzip it to the given directory
  * @param string The directory where to do the work
  * @param string The path of the temporary directory where the exercise was uploaded and unzipped
+ * @param string $baseWorkDir
+ * @param string $uploadPath
  * @return bool True on success, false on failure
  */
 function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath) {
@@ -229,7 +231,10 @@ 
  * @param string Path to the directory with the file to be parsed (without final /)
  * @param string Name of the last directory part for the file (without /)
  * @param string Name of the file to be parsed (including extension)
- * @return mixed True on success, error message on error
+ * @param string $exercisePath
+ * @param string $file
+ * @param string $questionFile
+ * @return string|boolean True on success, error message on error
  * @assert ('','','') === false
  */
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {

Spacing +15 added lines, -15 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;
@@ -38,10 +38,10 @@ 
 function aiken_display_form($msg = '') {
     $name_tools = get_lang('ImportAikenQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="exercise.php?show=test">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $form .= '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $form .= $msg;
-    $form_validator  = new FormValidator('aiken_upload', 'post',api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data') );
+    $form_validator = new FormValidator('aiken_upload', 'post', api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data'));
     $form_validator->addElement('header', $name_tools);
     $form_validator->addElement('text', 'total_weight', get_lang('TotalWeight'));
     $form_validator->addElement('file', 'userFile', get_lang('DownloadFile'));
@@ -89,7 +89,7 @@ 
     global $record_item_body;
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
-    $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(
@@ -154,7 +154,7 @@ 
         $result = 'NoTxtFileFoundInTheZip';
     }
 
-    if ($result !== true ) {
+    if ($result !== true) {
         return $result;
     }
 
@@ -215,7 +215,7 @@ 
         }
 
         // Delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         $operation = $last_exercise_id;
     }
 
@@ -235,8 +235,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';
@@ -248,13 +248,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';
@@ -286,7 +286,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');
@@ -306,7 +306,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 {
@@ -316,7 +316,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;

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

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)

main/exercice/export/exercise_import.inc.php

Doc Comments +5 added lines, -3 removed lines

@@ -30,6 +30,8 @@ 
  * Unzip the exercise in the temp folder
  * @param string The path of the temporary directory where the exercise was uploaded and unzipped
  * @param string
+ * @param string $baseWorkDir
+ * @param string $uploadPath
  * @return bool
  */
 function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
@@ -217,9 +219,9 @@ 
 
 /**
  * Parses a given XML file and fills global arrays with the elements
- * @param $exercisePath
- * @param $file
- * @param $questionFile
+ * @param string $exercisePath
+ * @param string $file
+ * @param string $questionFile
  * @return bool
  */
 function parse_file($exercisePath, $file, $questionFile)

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
     }
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -74,7 +74,7 @@ 
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
 
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'qti2';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'qti2';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -118,14 +118,14 @@ 
     // parse every subdirectory to search xml 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('/.xml$/i', $questionFile)) {
                     $result = parse_file($baseWorkDir, $file, $questionFile);
-                    $filePath = $baseWorkDir . $file;
+                    $filePath = $baseWorkDir.$file;
                     $file_found = true;
                 }
             }
@@ -133,7 +133,7 @@ 
 
             // Else ignore file
             $result = parse_file($baseWorkDir, '', $file);
-            $filePath = $baseWorkDir . '/' . $file;
+            $filePath = $baseWorkDir.'/'.$file;
             $file_found = true;
         }
     }
@@ -200,7 +200,7 @@ 
         }
 
         // delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         return $last_exercise_id;
     }
 
@@ -228,8 +228,8 @@ 
     global $record_item_body;
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!($fp = fopen($questionFilePath, 'r'))) {
         Display:: display_error_message(get_lang('Error opening question\'s XML file'));
@@ -326,10 +326,10 @@ 
     if ($record_item_body) {
 
         if ((!in_array($current_element, $non_HTML_tag_to_avoid))) {
-            $current_question_item_body .= "<" . $name;
+            $current_question_item_body .= "<".$name;
 
             foreach ($attributes as $attribute_name => $attribute_value) {
-                $current_question_item_body .= " " . $attribute_name . "=\"" . $attribute_value . "\"";
+                $current_question_item_body .= " ".$attribute_name."=\"".$attribute_value."\"";
             }
             $current_question_item_body .= ">";
         } else {
@@ -338,11 +338,11 @@ 
 
             if ($current_element == 'INLINECHOICEINTERACTION') {
 
-                $current_question_item_body .= "**claroline_start**" . $attributes['RESPONSEIDENTIFIER'] . "**claroline_end**";
+                $current_question_item_body .= "**claroline_start**".$attributes['RESPONSEIDENTIFIER']."**claroline_end**";
             }
             if ($current_element == 'TEXTENTRYINTERACTION') {
                 $correct_answer_value = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
-                $current_question_item_body .= "[" . $correct_answer_value . "]";
+                $current_question_item_body .= "[".$correct_answer_value."]";
 
             }
             if ($current_element == 'BR') {
@@ -457,7 +457,7 @@ 
     //treat the record of the full content of itembody tag :
 
     if ($record_item_body && (!in_array($current_element, $non_HTML_tag_to_avoid))) {
-        $current_question_item_body .= "</" . $name . ">";
+        $current_question_item_body .= "</".$name.">";
     }
 
     switch ($name) {
@@ -515,14 +515,14 @@ 
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= '' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= ''.trim($data);
             }
             break;
         case 'FEEDBACKINLINE':
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' ' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' '.trim($data);
             }
             break;
         case 'SIMPLEASSOCIABLECHOICE':
@@ -546,8 +546,8 @@ 
             $answer_identifier = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
             if ($current_inlinechoice_id == $answer_identifier) {
                 $current_question_item_body = str_replace(
-                    "**claroline_start**" . $current_answer_id . "**claroline_end**",
-                    "[" . $data . "]",
+                    "**claroline_start**".$current_answer_id."**claroline_end**",
+                    "[".$data."]",
                     $current_question_item_body
                 );
             } else {

main/exercice/export/qti2/qti2_export.php

Doc Comments +9 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
     /**
      * Constructor.
      *
-     * @param $question Ims2Question object we want to export.
+     * @param Ims2Question $question Ims2Question object we want to export.
      */
      function ImsAssessmentItem($question)
      {
@@ -101,7 +101,7 @@ 
       * 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 A string, the XML flow for an Item.
+      * @return string string, the XML flow for an Item.
       */
      function export($standalone = false)
      {
@@ -154,7 +154,7 @@ 
 
     /**
      * Constructor.
-     * @param $exe The Exercise instance to export
+     * @param Exercise $exe The Exercise instance to export
      * @author Amand Tihon <amand@alrj.org>
      */
     function ImsSection($exe)
@@ -239,7 +239,7 @@ 
      * Export the exercise in IMS/QTI.
      *
      * @param bool $standalone Wether it should include XML tag and DTD line.
-     * @return a string containing the XML flow
+     * @return string string containing the XML flow
      * @author Amand Tihon <amand@alrj.org>
      */
     function export($standalone)
@@ -383,7 +383,7 @@ 
       * 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 A string, the XML flow for an Item.
+      * @return string string, the XML flow for an Item.
       * @author Amand Tihon <amand@alrj.org>
       */
      function export($standalone = False)
@@ -417,7 +417,7 @@ 
  *
  * @param int $exerciseId The exercise to export
  * @param boolean $standalone Wether it should include XML tag and DTD line.
- * @return The XML as a string, or an empty string if there's no exercise with given ID.
+ * @return string XML as a string, or an empty string if there's no exercise with given ID.
  */
 function export_exercise_to_qti($exerciseId, $standalone = true)
 {
@@ -474,6 +474,9 @@ 
     return htmlspecialchars($text);
 }
 
+/**
+ * @param string $text
+ */
 function cleanAttribute($text)
 {
     return $text;

Indentation +159 added lines, -159 removed lines

@@ -34,21 +34,21 @@ 
      *
      * @param $question Ims2Question object we want to export.
      */
-     function ImsAssessmentItem($question)
-     {
+        function ImsAssessmentItem($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 A 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 A string, the XML flow for an Item.
+         */
+        function export($standalone = false)
+        {
         $head = $foot = "";
 
         if ($standalone) {
@@ -131,7 +131,7 @@ 
             .$foot;
 
         return $res;
-     }
+        }
 }
 
 /**
@@ -193,8 +193,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;
     }
 
@@ -208,15 +208,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;
@@ -230,7 +230,7 @@ 
     {
         $out = "";
         foreach ($this->exercise->selectQuestionList() as $q) {
-        	$out .= export_question_qti($q, false);
+            $out .= export_question_qti($q, false);
         }
         return $out;
     }
@@ -247,18 +247,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;
     }
@@ -304,97 +304,97 @@ 
      * @param $question The Question object we want to export.
      * @author Anamd Tihon
      */
-     function ImsItem($question)
-     {
+        function ImsItem($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 A 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 A 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";
         }
 
@@ -409,7 +409,7 @@ 
             . $this->answer->imsExportFeedback($this->questionIdent)
             . $this->end_item()
             . $foot;
-     }
+        }
 }
 
 /**
@@ -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);

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

main/exercice/export/scorm/scorm_classes.php

Doc Comments +5 added lines, -4 removed lines

@@ -27,6 +27,7 @@ 
      * @param int  The JavaScript ID for this question.
      * Due to the nature of interactions, we must have a natural sequence for
      * questions in the generated JavaScript.
+     * @param integer $js_id
      */
     public static function export_question($questionId, $standalone = true, $js_id)
     {
@@ -687,7 +688,7 @@ 
     /**
      * Constructor.
      *
-     * @param $question The Question object we want to export.
+     * @param ScormQuestion $question The Question object we want to export.
      */
     public function ScormAssessmentItem($question, $standalone = false)
     {
@@ -915,7 +916,7 @@ 
      *
      * @param int $exerciseId The exercise to exporte
      * @param boolean $standalone Wether it should include XML tag and DTD line.
-     * @return The XML as a string, or an empty string if there's no exercise with given ID.
+     * @return string XML as a string, or an empty string if there's no exercise with given ID.
      */
     public static function export_exercise_to_scorm($exerciseId, $standalone=true) {
         $exercise = new Exercise();
@@ -930,7 +931,7 @@ 
 
     /**
      * Constructor.
-     * @param $exe The Exercise instance to export
+     * @param Exercise $exe The Exercise instance to export
      * @author Amand Tihon <amand@alrj.org>
      */
     function ScormSection($exe) {
@@ -1091,7 +1092,7 @@ 
      * 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 A string, the XML flow for an Item.
+     * @return string string, the XML flow for an Item.
      */
     function export()
     {

Spacing +181 added lines, -181 removed lines

@@ -32,7 +32,7 @@ 
     {
         $question = new ScormQuestion();
         $qst = $question->read($questionId);
-        if( !$qst ) {
+        if (!$qst) {
             return '';
         }
         $question->id = $qst->id;
@@ -40,9 +40,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;
         $assessmentItem = new ScormAssessmentItem($question, $standalone);
         //echo "<pre>".print_r($scorm,1)."</pre>";exit;
         return $assessmentItem->export();
@@ -111,14 +111,14 @@ 
 		$html = $this->getQuestionHTML();
 		$js   = $this->getQuestionJS();
 
-		if( is_object($this->answer) )
+		if (is_object($this->answer))
 		{
-			list($js2,$html2) = $this->answer->export();
+			list($js2, $html2) = $this->answer->export();
 			$js .= $js2;
 			$html .= $html2;
 		}
 
-		return array($js,$html);
+		return array($js, $html);
 	}
 
     function createAnswersForm($form)
@@ -136,19 +136,19 @@ 
      */
     function getQuestionHTML()
     {
-    	$title			= $this->selectTitle();
-		$description	= $this->selectDescription();
+    	$title = $this->selectTitle();
+		$description = $this->selectDescription();
 		$cols = 2;
-		$s='<tr>' .
-			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
+		$s = '<tr>'.
+			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">'."\n".
 		   	$title.
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n" .
-		   	'<tr>' . "\n" .
-		   	'<td valign="top" colspan="'.$cols.'">' . "\n" .
-		   	'<i>'.$description.'</i>' . "\n" .
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n";
+		   	'</td>'."\n".
+		   	'</tr>'."\n".
+		   	'<tr>'."\n".
+		   	'<td valign="top" colspan="'.$cols.'">'."\n".
+		   	'<i>'.$description.'</i>'."\n".
+		   	'</td>'."\n".
+		   	'</tr>'."\n";
 		return $s;
     }
 
@@ -160,10 +160,10 @@ 
     	//$id = $this->id;
     	$w = $this->selectWeighting();
     	$s = 'questions.push('.$this->js_id.');'."\n";
-    	if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
+    	if ($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
     	{ //put the max score to 0 to avoid discounting the points of
     	  //non-exported quiz types in the SCORM
-    		$w=0;
+    		$w = 0;
     	}
     	$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
     	return $s;
@@ -184,40 +184,40 @@ 
 	{
 		$html = '';
     	$js   = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		$type = $this->getQuestionType();
 		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
 		//not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
         //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-		if ($type == MCMA ) {
+		if ($type == MCMA) {
         	//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
         	$id = 1;
         	$jstmp = '';
         	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
+			foreach ($this->answer as $i => $answer)
 			{
 				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
 				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
+		    		'<tr>'."\n"
+				.	'<td align="center" width="5%">'."\n"
+		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />'."\n"
+		    	.	'</td>'."\n"
+		    	.	'<td width="95%">'."\n"
+		    	.	'<label for="'.$identifier.'">'.$this->answer[$i].'</label>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'</tr>'."\n\n";
 		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
+		    	if ($this->correct[$i])
 		    	{
 		    		$jstmpc .= $i.',';
 		    	}
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
 		    	$id++;
 			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
+	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc, 0, -1).');'."\n";
 	    	if ($type == MCMA) {
 	    		$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
 	    	} else {
@@ -228,14 +228,14 @@ 
         		//To this items we show the ThisItemIsNotExportable
         	    $qId = $this->questionJSId;
 		    	$js = '';
-		    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+		    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 				// some javascript must be added for that kind of questions
-				$html .= '<tr>' . "\n"
-						.	'<td>' . "\n"
-				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
-				    	.	'</td>' . "\n"
-				    	.	'</tr>' . "\n";
-				$html .= '</table></td></tr>' . "\n";
+				$html .= '<tr>'."\n"
+						.	'<td>'."\n"
+				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>'."\n"
+				    	.	'</td>'."\n"
+				    	.	'</tr>'."\n";
+				$html .= '</table></td></tr>'."\n";
 				// currently the exact answers cannot be displayed, so ignore the textarea
 				$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 				$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
@@ -245,40 +245,40 @@ 
 				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
 		    	$js .= $jstmpw;
-		        return array($js,$html);
+		        return array($js, $html);
         } else {
         	//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
         	$id = 1;
         	$jstmp = '';
         	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
+			foreach ($this->answer as $i => $answer)
 			{
 	        	$identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
 	        	$identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
 				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
+		    		'<tr>'."\n"
+				.	'<td align="center" width="5%">'."\n"
+		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'<td width="95%">'."\n"
+		    	.	'<label for="'.$identifier.'">'.$this->answer[$i].'</label>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'</tr>'."\n\n";
 		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
+		    	if ($this->correct[$i])
 		    	{
 		    		$jstmpc .= $i;
 		    	}
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
 		    	$id++;
 			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
 	    	$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
 			$js .= $jstmpw;
         }
-		$html .= '</table></td></tr>' . "\n";
-        return array($js,$html);
+		$html .= '</table></td></tr>'."\n";
+        return array($js, $html);
     }
 }
 
@@ -302,29 +302,29 @@ 
 		$identifier_true  = $identifier.'_true';
 		$identifier_false = $identifier.'_false';
 		$html .=
-    		'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
+    		'<tr>'."\n"
+		.	'<td align="center" width="5%">'."\n"
     	.	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
-		.		'/>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'<td width="95%">' . "\n"
-    	.	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'</tr>' . "\n\n";
+		.		'/>'."\n"
+    	.	'</td>'."\n"
+    	.	'<td width="95%">'."\n"
+    	.	'<label for="'.$identifier_true.'">'.get_lang('True').'</label>'."\n"
+    	.	'</td>'."\n"
+    	.	'</tr>'."\n\n";
     	$html .=
-			'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
+			'<tr>'."\n"
+		.	'<td align="center" width="5%">'."\n"
 		.	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
-		.		'/>' . "\n"
-		.	'</td>' . "\n"
-		.	'<td width="95%">' . "\n"
-		.	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
-		.	'</td>' . "\n"
-		.	'</tr>' . "\n\n";
-		$html .= '</table></td></tr>' . "\n";
+		.		'/>'."\n"
+		.	'</td>'."\n"
+		.	'<td width="95%">'."\n"
+		.	'<label for="'.$identifier_false.'">'.get_lang('False').'</label>'."\n"
+		.	'</td>'."\n"
+		.	'</tr>'."\n\n";
+		$html .= '</table></td></tr>'."\n";
 		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if($this->response == 'TRUE')
+		if ($this->response == 'TRUE')
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
 		}
@@ -337,7 +337,7 @@ 
     	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
     	$js .= $jstmpw;
 
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -357,56 +357,56 @@ 
     {
     	global $charset;
     	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		// get all enclosed answers
 		$blankList = array();
 		// build replacement
 		$replacementList = array();
-		foreach( $this->answer as $i => $answer) {
+		foreach ($this->answer as $i => $answer) {
 			$blankList[] = '['.$answer.']';
 		}
 		$answerCount = count($blankList);
 
 		// splits text and weightings that are joined with the character '::'
-		list($answer,$weight)=explode('::',$answer);
-		$weights = explode(',',$weight);
+		list($answer, $weight) = explode('::', $answer);
+		$weights = explode(',', $weight);
 		// because [] is parsed here we follow this procedure:
 		// 1. find everything between the [ and ] tags
-		$i=1;
+		$i = 1;
 		$jstmp = '';
 		$jstmpc = '';
 		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$startlocations=api_strpos($answer,'[');
-		$endlocations=api_strpos($answer,']');
-		while($startlocations !== false && $endlocations !== false) {
-			$texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+		$startlocations = api_strpos($answer, '[');
+		$endlocations = api_strpos($answer, ']');
+		while ($startlocations !== false && $endlocations !== false) {
+			$texstring = api_substr($answer, $startlocations, ($endlocations - $startlocations) + 1);
+			$answer = api_substr_replace($answer, '<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />', $startlocations, ($endlocations - $startlocations) + 1);
 			$jstmp .= $i.',';
-			$jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
-				$my_weight=explode('@',$weights[$i-1]);
-				if (count($my_weight)==2) {
-					$weight_db=$my_weight[0];
+			$jstmpc .= "'".api_htmlentities(api_substr($texstring, 1, -1), ENT_QUOTES, $charset)."',";
+				$my_weight = explode('@', $weights[$i - 1]);
+				if (count($my_weight) == 2) {
+					$weight_db = $my_weight[0];
 				} else {
-					$weight_db=$my_weight[0];
+					$weight_db = $my_weight[0];
 				}
 	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
 			$i++;
-			$startlocations=api_strpos($answer,'[');
-			$endlocations=api_strpos($answer,']');
+			$startlocations = api_strpos($answer, '[');
+			$endlocations = api_strpos($answer, ']');
 		}
 
-		$html .= 	'<tr>' . "\n"
-				.	'<td>' . "\n"
-		    	.	$answer  . "\n"
-	    		.	'</td>' . "\n"
-	    		.	'</tr>' . "\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+		$html .= '<tr>'."\n"
+				.	'<td>'."\n"
+		    	.	$answer."\n"
+	    		.	'</td>'."\n"
+	    		.	'</tr>'."\n";
+		$html .= '</table></td></tr>'."\n";
+		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp, 0, -1).');'."\n";
+    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc, 0, -1).');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
     	$js .= $jstmpw;
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -423,7 +423,7 @@ 
     function export()
     {
     	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
   		// prepare list of right proposition to allow
 		// - easiest display
 		// - easiest randomisation if needed one day
@@ -432,12 +432,12 @@ 
 			$displayedRightList = array_values($this->rightList);
 		}
 		// get max length of displayed array
-		$arrayLength = max( count($this->leftList), count($this->rightList) );
+		$arrayLength = max(count($this->leftList), count($this->rightList));
 
-		$nbrAnswers=$this->selectNbrAnswers();
-		$cpt1='A';
-		$cpt2=1;
-		$Select=array();
+		$nbrAnswers = $this->selectNbrAnswers();
+		$cpt1 = 'A';
+		$cpt2 = 1;
+		$Select = array();
 		$qId = $this->questionJSId;
 		$s = '';
 		$jstmp = '';
@@ -445,74 +445,74 @@ 
         $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
         $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+		for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
 			$identifier = 'question_'.$qId.'_matching_';
-			$answer=$this->selectAnswer($answerId);
-			$answerCorrect=$this->isCorrect($answerId);
-			$weight=$this->selectWeighting($answerId);
+			$answer = $this->selectAnswer($answerId);
+			$answerCorrect = $this->isCorrect($answerId);
+			$weight = $this->selectWeighting($answerId);
 			$jstmp .= $answerId.',';
 
 			if (!$answerCorrect) {
 				// options (A, B, C, ...) that will be put into the list-box
-				$Select[$answerId]['Lettre']=$cpt1;
+				$Select[$answerId]['Lettre'] = $cpt1;
 				// answers that will be shown at the right side
 				$Select[$answerId]['Reponse'] = $answer;
 				$cpt1++;
 			} else {
-				$s.='<tr>'."\n";
-				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
+				$s .= '<tr>'."\n";
+				$s .= '<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
+				$s .= '<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
+				$s .= ' <option value="0">--</option>';
 	            // fills the list-box
-	            foreach($Select as $key=>$val)
+	            foreach ($Select as $key=>$val)
 	            {
-					$s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
+					$s .= '<option value="'.$key.'">'.$val['Lettre'].'</option>';
 				}  // end foreach()
 
-				$s.='</select>&nbsp;&nbsp;</td>'."\n";
-				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
-				$s.="</td>\n</tr>\n";
+				$s .= '</select>&nbsp;&nbsp;</td>'."\n";
+				$s .= '<td width="40%" valign="top">';
+				if (isset($Select[$cpt2])) $s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+					else $s .= '&nbsp;';
+				$s .= "</td>\n</tr>\n";
 
 				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
 
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
+				$my_weight = explode('@', $weight);
+				if (count($my_weight) == 2) {
+					$weight = $my_weight[0];
 				} else {
-					$weight=$my_weight[0];
+					$weight = $my_weight[0];
 				}
 		    	$jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
 				$cpt2++;
 
 				// if the left side of the "matching" has been completely shown
-				if($answerId == $nbrAnswers)
+				if ($answerId == $nbrAnswers)
 				{
 					// if there remain answers to be shown on the right side
-					while(isset($Select[$cpt2]))
+					while (isset($Select[$cpt2]))
 					{
 						//$s.='<tr>'."\n";
 						//$s.='<td colspan="2">'."\n";
 						//$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
-						$s.='<tr>'."\n";
-						$s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
-						$s.='<td width="40%" valign="top">';
-						$s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.="</td>\n</tr>\n";
+						$s .= '<tr>'."\n";
+						$s .= '<td width="60%" colspan="2">&nbsp;</td>'."\n";
+						$s .= '<td width="40%" valign="top">';
+						$s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+						$s .= "</td>\n</tr>\n";
 						$cpt2++;
 					}	// end while()
 				}  // end if()
 			}
 		}
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
+    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc, 0, -1).');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
     	$js .= $jstmpw;
 		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
+		$html .= '</table></td></tr>'."\n";
 
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -549,7 +549,7 @@ 
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
     	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
     	$js .= $jstmpw;
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 /**
@@ -601,15 +601,15 @@ 
     function export()
     {
     	$js = $this->get_js_header();
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		// some javascript must be added for that kind of questions
 		$html .= '';
 
 		// Get the answers, make a list
-		$nbrAnswers=$this->selectNbrAnswers();
+		$nbrAnswers = $this->selectNbrAnswers();
 
 		$answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
+		for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++)
 		{
 			$answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
 		}
@@ -658,11 +658,11 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></td></tr>' . "\n";
+		$html .= '</table></td></tr>'."\n";
 
 		// currently the free answers cannot be displayed, so ignore the textarea
 		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -693,7 +693,7 @@ 
     {
         $this->question = $question;
         $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
         $this->standalone = $standalone;
     }
 
@@ -707,9 +707,9 @@ 
     {
         global $charset;
         $head = "";
-        if( $this->standalone)
+        if ($this->standalone)
         {
-            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>'."\n";
             $head .= '<html>'."\n";
         }
         return $head;
@@ -720,7 +720,7 @@ 
      *
      */
     function end_page() {
-        if($this->standalone){return '</html>';}
+        if ($this->standalone) {return '</html>'; }
         return '';
     }
 
@@ -728,7 +728,7 @@ 
      * Start document header
      */
     function start_header() {
-        if($this->standalone){return '<head>'. "\n";}
+        if ($this->standalone) {return '<head>'."\n"; }
         return '';
     }
 
@@ -755,7 +755,7 @@ 
      */
     function end_header()
     {
-        if($this->standalone){return '</head>'. "\n";}
+        if ($this->standalone) {return '</head>'."\n"; }
         return '';
     }
     /**
@@ -775,11 +775,11 @@ 
     function common_js()
     {
         $js = file_get_contents('../newscorm/js/api_wrapper.js');
-        $js .= 'var questions = new Array();' . "\n";
-        $js .= 'var questions_answers = new Array();' . "\n";
-        $js .= 'var questions_answers_correct = new Array();' . "\n";
-        $js .= 'var questions_types = new Array();' . "\n";
-        $js .= "\n" .
+        $js .= 'var questions = new Array();'."\n";
+        $js .= 'var questions_answers = new Array();'."\n";
+        $js .= 'var questions_answers_correct = new Array();'."\n";
+        $js .= 'var questions_types = new Array();'."\n";
+        $js .= "\n".
             '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
@@ -819,7 +819,7 @@ 
         //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
         //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
         $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-        if($this->standalone){return $js. "\n";}
+        if ($this->standalone) {return $js."\n"; }
         return '';
     }
 
@@ -829,7 +829,7 @@ 
      */
     function end_js()
     {
-        if($this->standalone){return '</script>'. "\n";}
+        if ($this->standalone) {return '</script>'."\n"; }
         return '';
     }
 
@@ -839,7 +839,7 @@ 
      */
     function start_body()
     {
-        if($this->standalone){return '<body>'. "\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n";}
+        if ($this->standalone) {return '<body>'."\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n"; }
         return '';
     }
 
@@ -849,7 +849,7 @@ 
      */
     function end_body()
     {
-        if($this->standalone){return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";}
+        if ($this->standalone) {return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n"; }
         return '';
     }
 
@@ -864,9 +864,9 @@ 
     function export()
     {
         $js = $html = '';
-        list($js,$html) = $this->question->export();
+        list($js, $html) = $this->question->export();
         //list($js,$html) = $this->question->answer->export();
-        if($this->standalone)
+        if ($this->standalone)
         {
             $res = $this->start_page()
                 . $this->start_header()
@@ -888,7 +888,7 @@ 
         }
         else
         {
-            return array($js,$html);
+            return array($js, $html);
         }
     }
 }
@@ -917,9 +917,9 @@ 
      * @param boolean $standalone Wether it should include XML tag and DTD line.
      * @return The XML as a string, or an empty string if there's no exercise with given ID.
      */
-    public static function export_exercise_to_scorm($exerciseId, $standalone=true) {
+    public static function export_exercise_to_scorm($exerciseId, $standalone = true) {
         $exercise = new Exercise();
-        if (! $exercise->read($exerciseId)) {
+        if (!$exercise->read($exerciseId)) {
             return '';
         }
         $ims = new ScormSection($exercise);
@@ -946,7 +946,7 @@ 
     function start_page() {
         global $charset;
         $head = $foot = "";
-        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n".'<html>'."\n";
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>'."\n".'<html>'."\n";
         return $head;
     }
 
@@ -962,7 +962,7 @@ 
      * Start document header
      */
     function start_header() {
-        return '<head>'. "\n";
+        return '<head>'."\n";
     }
 
     /**
@@ -984,7 +984,7 @@ 
      * End document header
      */
     function end_header() {
-        return '</head>'. "\n";
+        return '</head>'."\n";
     }
 
     /**
@@ -992,7 +992,7 @@ 
      *
      */
     function start_js() {
-        return '<script type="text/javascript" language="javascript">'. "\n";
+        return '<script type="text/javascript" language="javascript">'."\n";
     }
 
     /**
@@ -1002,11 +1002,11 @@ 
         $js = "\n";
         $js .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
         $js .= file_get_contents('../newscorm/js/api_wrapper.js');
-        $js .= 'var questions = new Array();' . "\n";
-        $js .= 'var questions_answers = new Array();' . "\n";
-        $js .= 'var questions_answers_correct = new Array();' . "\n";
-        $js .= 'var questions_types = new Array();' . "\n";
-        $js .= "\n" .
+        $js .= 'var questions = new Array();'."\n";
+        $js .= 'var questions_answers = new Array();'."\n";
+        $js .= 'var questions_answers_correct = new Array();'."\n";
+        $js .= 'var questions_types = new Array();'."\n";
+        $js .= "\n".
             '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
@@ -1053,7 +1053,7 @@ 
         //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
         //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
         $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-        return $js. "\n";
+        return $js."\n";
     }
 
     /**
@@ -1061,7 +1061,7 @@ 
      *
      */
     function end_js() {
-        return '</script>'. "\n";
+        return '</script>'."\n";
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
      */
     function start_body()
     {
-        return '<body>'. "\n".
+        return '<body>'."\n".
         '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>\n".
         '<form id="dokeos_scorm_form" method="post" action="">'."\n".
         '<table width="100%">'."\n";
@@ -1082,7 +1082,7 @@ 
      */
     function end_body()
     {
-        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";
+        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n";
     }
 
     /**
@@ -1099,11 +1099,11 @@ 
 
         $head = "";
         if ($this->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";
         }
 
-        list($js,$html) = $this->export_questions();
+        list($js, $html) = $this->export_questions();
         //list($js,$html) = $this->question->answer->export();
         $res = $this->start_page()
             . $this->start_header()
@@ -1134,12 +1134,12 @@ 
         $js = $html = "";
         $js_id = 0;
         foreach ($this->exercise->selectQuestionList() as $q) {
-            list($jstmp,$htmltmp)= ScormQuestion::export_question($q, false, $js_id);
+            list($jstmp, $htmltmp) = ScormQuestion::export_question($q, false, $js_id);
             $js .= $jstmp."\n";
             $html .= $htmltmp."\n";
             ++$js_id;
         }
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 

Braces +8 added lines, -8 removed lines

@@ -327,8 +327,7 @@ 
 		if($this->response == 'TRUE')
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
-		}
-		else
+		} else
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
 		}
@@ -471,8 +470,11 @@ 
 
 				$s.='</select>&nbsp;&nbsp;</td>'."\n";
 				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
+				if(isset($Select[$cpt2])) {
+				    $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+				} else {
+					    $s.='&nbsp;';
+					}
 				$s.="</td>\n</tr>\n";
 
 				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
@@ -577,8 +579,7 @@ 
 			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
 	    	$header .= $jstmpw;
-		}
-		else
+		} else
 		{
 			$header = '';
 			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
@@ -885,8 +886,7 @@ 
                 . $this->end_body()
                 . $this->end_page();
             return $res;
-        }
-        else
+        } else
         {
             return array($js,$html);
         }

Indentation +421 added lines, -421 removed lines

@@ -49,86 +49,86 @@ 
     }
 
     /**
-	 * Include the correct answer class and create answer
-	 */
-	public function setAnswer()
-	{
-		switch ($this->type) {
-			case MCUA:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+     * Include the correct answer class and create answer
+     */
+    public function setAnswer()
+    {
+        switch ($this->type) {
+            case MCUA:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MCMA:
+                break;
+            case MCMA:
             case GLOBAL_MULTIPLE_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case TF:
-				$this->answer = new ScormAnswerTrueFalse($this->id);
+                break;
+            case TF:
+                $this->answer = new ScormAnswerTrueFalse($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case FIB:
-				$this->answer = new ScormAnswerFillInBlanks($this->id);
+                break;
+            case FIB:
+                $this->answer = new ScormAnswerFillInBlanks($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MATCHING:
+                break;
+            case MATCHING:
             case MATCHING_DRAGGABLE:
-				$this->answer = new ScormAnswerMatching($this->id);
+                $this->answer = new ScormAnswerMatching($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
+                break;
             case ORAL_EXPRESSION:
-			case FREE_ANSWER:
-				$this->answer = new ScormAnswerFree($this->id);
+            case FREE_ANSWER:
+                $this->answer = new ScormAnswerFree($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                break;
+            case HOT_SPOT:
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MULTIPLE_ANSWER_COMBINATION:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+                break;
+            case MULTIPLE_ANSWER_COMBINATION:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
+                break;
             case HOT_SPOT_ORDER:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_DELINEATION:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                break;
+            case HOT_SPOT_DELINEATION:
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			default :
-				$this->answer = null;
+                break;
+            default :
+                $this->answer = null;
                 $this->answer->questionJSId = $this->js_id;
-				break;
-		}
+                break;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	function export()
-	{
-		$html = $this->getQuestionHTML();
-		$js   = $this->getQuestionJS();
+    function export()
+    {
+        $html = $this->getQuestionHTML();
+        $js   = $this->getQuestionJS();
 
-		if( is_object($this->answer) )
-		{
-			list($js2,$html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		}
+        if( is_object($this->answer) )
+        {
+            list($js2,$html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        }
 
-		return array($js,$html);
-	}
+        return array($js,$html);
+    }
 
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
 
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 
     /**
@@ -136,20 +136,20 @@ 
      */
     function getQuestionHTML()
     {
-    	$title			= $this->selectTitle();
-		$description	= $this->selectDescription();
-		$cols = 2;
-		$s='<tr>' .
-			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
-		   	$title.
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n" .
-		   	'<tr>' . "\n" .
-		   	'<td valign="top" colspan="'.$cols.'">' . "\n" .
-		   	'<i>'.$description.'</i>' . "\n" .
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n";
-		return $s;
+        $title			= $this->selectTitle();
+        $description	= $this->selectDescription();
+        $cols = 2;
+        $s='<tr>' .
+            '<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
+                $title.
+                '</td>' . "\n" .
+                '</tr>' . "\n" .
+                '<tr>' . "\n" .
+                '<td valign="top" colspan="'.$cols.'">' . "\n" .
+                '<i>'.$description.'</i>' . "\n" .
+                '</td>' . "\n" .
+                '</tr>' . "\n";
+        return $s;
     }
 
     /**
@@ -157,16 +157,16 @@ 
      */
     function getQuestionJS()
     {
-    	//$id = $this->id;
-    	$w = $this->selectWeighting();
-    	$s = 'questions.push('.$this->js_id.');'."\n";
-    	if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
-    	{ //put the max score to 0 to avoid discounting the points of
-    	  //non-exported quiz types in the SCORM
-    		$w=0;
-    	}
-    	$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
-    	return $s;
+        //$id = $this->id;
+        $w = $this->selectWeighting();
+        $s = 'questions.push('.$this->js_id.');'."\n";
+        if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
+        { //put the max score to 0 to avoid discounting the points of
+            //non-exported quiz types in the SCORM
+            $w=0;
+        }
+        $s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
+        return $s;
     }
 }
 
@@ -177,107 +177,107 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
+    /**
+     * Return HTML code for possible answers
      */
-	function export()
-	{
-		$html = '';
-    	$js   = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		$type = $this->getQuestionType();
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-
-		//not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
+    function export()
+    {
+        $html = '';
+        $js   = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        $type = $this->getQuestionType();
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+
+        //not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
         //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-		if ($type == MCMA ) {
-        	//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
-        	$id = 1;
-        	$jstmp = '';
-        	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
-			{
-				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
-				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
-		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
-		    	{
-		    		$jstmpc .= $i.',';
-		    	}
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
-		    	$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
-	    	if ($type == MCMA) {
-	    		$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-	    	} else {
-	    		$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-	    	}
-	    	$js .= $jstmpw;
+        if ($type == MCMA ) {
+            //$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            foreach( $this->answer as $i => $answer )
+            {
+                $identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
+                $html .=
+                    '<tr>' . "\n"
+                .	'<td align="center" width="5%">' . "\n"
+                .	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
+                .	'</td>' . "\n"
+                .	'<td width="95%">' . "\n"
+                .	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n\n";
+                $jstmp .= $i.',';
+                if($this->correct[$i])
+                {
+                    $jstmpc .= $i.',';
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+            if ($type == MCMA) {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
+            } else {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+            }
+            $js .= $jstmpw;
         } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-        		//To this items we show the ThisItemIsNotExportable
-        	    $qId = $this->questionJSId;
-		    	$js = '';
-		    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-				// some javascript must be added for that kind of questions
-				$html .= '<tr>' . "\n"
-						.	'<td>' . "\n"
-				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
-				    	.	'</td>' . "\n"
-				    	.	'</tr>' . "\n";
-				$html .= '</table></td></tr>' . "\n";
-				// currently the exact answers cannot be displayed, so ignore the textarea
-				$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-				$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-		    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-		    	$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-				$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-		    	$js .= $jstmpw;
-		        return array($js,$html);
+                //To this items we show the ThisItemIsNotExportable
+                $qId = $this->questionJSId;
+                $js = '';
+                $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+                // some javascript must be added for that kind of questions
+                $html .= '<tr>' . "\n"
+                        .	'<td>' . "\n"
+                        . '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
+                        .	'</td>' . "\n"
+                        .	'</tr>' . "\n";
+                $html .= '</table></td></tr>' . "\n";
+                // currently the exact answers cannot be displayed, so ignore the textarea
+                $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+                $js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+                $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+                $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+                $js .= $jstmpw;
+                return array($js,$html);
         } else {
-        	//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
-        	$id = 1;
-        	$jstmp = '';
-        	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
-			{
-	        	$identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
-	        	$identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
-				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
-		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
-		    	{
-		    		$jstmpc .= $i;
-		    	}
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
-		    	$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
-	    	$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
-			$js .= $jstmpw;
+            //$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            foreach( $this->answer as $i => $answer )
+            {
+                $identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
+                $identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
+                $html .=
+                    '<tr>' . "\n"
+                .	'<td align="center" width="5%">' . "\n"
+                .	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
+                .	'</td>' . "\n"
+                .	'<td width="95%">' . "\n"
+                .	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n\n";
+                $jstmp .= $i.',';
+                if($this->correct[$i])
+                {
+                    $jstmpc .= $i;
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
+            $js .= $jstmpw;
         }
-		$html .= '</table></td></tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
         return array($js,$html);
     }
 }
@@ -288,7 +288,7 @@ 
  */
 class ScormAnswerTrueFalse extends Answer
 {
-	/**
+    /**
      * Return the XML flow for the possible answers.
      * That's one <response_lid>, containing several <flow_label>
      *
@@ -296,46 +296,46 @@ 
      */
     function export()
     {
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">';
-		$identifier = 'question_'.$this->questionJSId.'_tf';
-		$identifier_true  = $identifier.'_true';
-		$identifier_false = $identifier.'_false';
-		$html .=
-    		'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
-    	.	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
-		.		'/>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'<td width="95%">' . "\n"
-    	.	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'</tr>' . "\n\n";
-    	$html .=
-			'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
-		.	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
-		.		'/>' . "\n"
-		.	'</td>' . "\n"
-		.	'<td width="95%">' . "\n"
-		.	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
-		.	'</td>' . "\n"
-		.	'</tr>' . "\n\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if($this->response == 'TRUE')
-		{
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
-		}
-		else
-		{
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
-		}
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
-    	$js .= $jstmpw;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        $identifier = 'question_'.$this->questionJSId.'_tf';
+        $identifier_true  = $identifier.'_true';
+        $identifier_false = $identifier.'_false';
+        $html .=
+            '<tr>' . "\n"
+        .	'<td align="center" width="5%">' . "\n"
+        .	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
+        .		'/>' . "\n"
+        .	'</td>' . "\n"
+        .	'<td width="95%">' . "\n"
+        .	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
+        .	'</td>' . "\n"
+        .	'</tr>' . "\n\n";
+        $html .=
+            '<tr>' . "\n"
+        .	'<td align="center" width="5%">' . "\n"
+        .	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
+        .		'/>' . "\n"
+        .	'</td>' . "\n"
+        .	'<td width="95%">' . "\n"
+        .	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
+        .	'</td>' . "\n"
+        .	'</tr>' . "\n\n";
+        $html .= '</table></td></tr>' . "\n";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
+        if($this->response == 'TRUE')
+        {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
+        }
+        else
+        {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
+        }
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
+        $js .= $jstmpw;
 
         return array($js,$html);
     }
@@ -347,7 +347,7 @@ 
  */
 class ScormAnswerFillInBlanks extends Answer
 {
-	/**
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -355,57 +355,57 @@ 
      */
     function export()
     {
-    	global $charset;
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		// get all enclosed answers
-		$blankList = array();
-		// build replacement
-		$replacementList = array();
-		foreach( $this->answer as $i => $answer) {
-			$blankList[] = '['.$answer.']';
-		}
-		$answerCount = count($blankList);
-
-		// splits text and weightings that are joined with the character '::'
-		list($answer,$weight)=explode('::',$answer);
-		$weights = explode(',',$weight);
-		// because [] is parsed here we follow this procedure:
-		// 1. find everything between the [ and ] tags
-		$i=1;
-		$jstmp = '';
-		$jstmpc = '';
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$startlocations=api_strpos($answer,'[');
-		$endlocations=api_strpos($answer,']');
-		while($startlocations !== false && $endlocations !== false) {
-			$texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
-			$jstmp .= $i.',';
-			$jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
-				$my_weight=explode('@',$weights[$i-1]);
-				if (count($my_weight)==2) {
-					$weight_db=$my_weight[0];
-				} else {
-					$weight_db=$my_weight[0];
-				}
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
-			$i++;
-			$startlocations=api_strpos($answer,'[');
-			$endlocations=api_strpos($answer,']');
-		}
+        global $charset;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        // get all enclosed answers
+        $blankList = array();
+        // build replacement
+        $replacementList = array();
+        foreach( $this->answer as $i => $answer) {
+            $blankList[] = '['.$answer.']';
+        }
+        $answerCount = count($blankList);
+
+        // splits text and weightings that are joined with the character '::'
+        list($answer,$weight)=explode('::',$answer);
+        $weights = explode(',',$weight);
+        // because [] is parsed here we follow this procedure:
+        // 1. find everything between the [ and ] tags
+        $i=1;
+        $jstmp = '';
+        $jstmpc = '';
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $startlocations=api_strpos($answer,'[');
+        $endlocations=api_strpos($answer,']');
+        while($startlocations !== false && $endlocations !== false) {
+            $texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
+            $answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+            $jstmp .= $i.',';
+            $jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
+                $my_weight=explode('@',$weights[$i-1]);
+                if (count($my_weight)==2) {
+                    $weight_db=$my_weight[0];
+                } else {
+                    $weight_db=$my_weight[0];
+                }
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $startlocations=api_strpos($answer,'[');
+            $endlocations=api_strpos($answer,']');
+        }
 
-		$html .= 	'<tr>' . "\n"
-				.	'<td>' . "\n"
-		    	.	$answer  . "\n"
-	    		.	'</td>' . "\n"
-	    		.	'</tr>' . "\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
-    	$js .= $jstmpw;
+        $html .= 	'<tr>' . "\n"
+                .	'<td>' . "\n"
+                .	$answer  . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
+        $js .= $jstmpw;
         return array($js,$html);
     }
 }
@@ -416,101 +416,101 @@ 
  */
 class ScormAnswerMatching extends Answer
 {
-	/**
+    /**
      * Export the question part as a matrix-choice, with only one possible answer per line.
      * @author Amand Tihon <amand@alrj.org>
      */
     function export()
     {
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-  		// prepare list of right proposition to allow
-		// - easiest display
-		// - easiest randomisation if needed one day
-		// (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
-		if (is_array($this->rightList)) {
-			$displayedRightList = array_values($this->rightList);
-		}
-		// get max length of displayed array
-		$arrayLength = max( count($this->leftList), count($this->rightList) );
-
-		$nbrAnswers=$this->selectNbrAnswers();
-		$cpt1='A';
-		$cpt2=1;
-		$Select=array();
-		$qId = $this->questionJSId;
-		$s = '';
-		$jstmp = '';
-		$jstmpc = '';
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+            // prepare list of right proposition to allow
+        // - easiest display
+        // - easiest randomisation if needed one day
+        // (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
+        if (is_array($this->rightList)) {
+            $displayedRightList = array_values($this->rightList);
+        }
+        // get max length of displayed array
+        $arrayLength = max( count($this->leftList), count($this->rightList) );
+
+        $nbrAnswers=$this->selectNbrAnswers();
+        $cpt1='A';
+        $cpt2=1;
+        $Select=array();
+        $qId = $this->questionJSId;
+        $s = '';
+        $jstmp = '';
+        $jstmpc = '';
         $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
         $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-			$identifier = 'question_'.$qId.'_matching_';
-			$answer=$this->selectAnswer($answerId);
-			$answerCorrect=$this->isCorrect($answerId);
-			$weight=$this->selectWeighting($answerId);
-			$jstmp .= $answerId.',';
-
-			if (!$answerCorrect) {
-				// options (A, B, C, ...) that will be put into the list-box
-				$Select[$answerId]['Lettre']=$cpt1;
-				// answers that will be shown at the right side
-				$Select[$answerId]['Reponse'] = $answer;
-				$cpt1++;
-			} else {
-				$s.='<tr>'."\n";
-				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
-	            // fills the list-box
-	            foreach($Select as $key=>$val)
-	            {
-					$s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
-				}  // end foreach()
-
-				$s.='</select>&nbsp;&nbsp;</td>'."\n";
-				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
-				$s.="</td>\n</tr>\n";
-
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
-
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
-				} else {
-					$weight=$my_weight[0];
-				}
-		    	$jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
-				$cpt2++;
-
-				// if the left side of the "matching" has been completely shown
-				if($answerId == $nbrAnswers)
-				{
-					// if there remain answers to be shown on the right side
-					while(isset($Select[$cpt2]))
-					{
-						//$s.='<tr>'."\n";
-						//$s.='<td colspan="2">'."\n";
-						//$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
-						$s.='<tr>'."\n";
-						$s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
-						$s.='<td width="40%" valign="top">';
-						$s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.="</td>\n</tr>\n";
-						$cpt2++;
-					}	// end while()
-				}  // end if()
-			}
-		}
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
-    	$js .= $jstmpw;
-		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
+        for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+            $identifier = 'question_'.$qId.'_matching_';
+            $answer=$this->selectAnswer($answerId);
+            $answerCorrect=$this->isCorrect($answerId);
+            $weight=$this->selectWeighting($answerId);
+            $jstmp .= $answerId.',';
+
+            if (!$answerCorrect) {
+                // options (A, B, C, ...) that will be put into the list-box
+                $Select[$answerId]['Lettre']=$cpt1;
+                // answers that will be shown at the right side
+                $Select[$answerId]['Reponse'] = $answer;
+                $cpt1++;
+            } else {
+                $s.='<tr>'."\n";
+                $s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
+                $s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
+                $s.=' <option value="0">--</option>';
+                // fills the list-box
+                foreach($Select as $key=>$val)
+                {
+                    $s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
+                }  // end foreach()
+
+                $s.='</select>&nbsp;&nbsp;</td>'."\n";
+                $s.='<td width="40%" valign="top">';
+                if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                    else $s.='&nbsp;';
+                $s.="</td>\n</tr>\n";
+
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+
+                $my_weight=explode('@',$weight);
+                if (count($my_weight)==2) {
+                    $weight=$my_weight[0];
+                } else {
+                    $weight=$my_weight[0];
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
+                $cpt2++;
+
+                // if the left side of the "matching" has been completely shown
+                if($answerId == $nbrAnswers)
+                {
+                    // if there remain answers to be shown on the right side
+                    while(isset($Select[$cpt2]))
+                    {
+                        //$s.='<tr>'."\n";
+                        //$s.='<td colspan="2">'."\n";
+                        //$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
+                        $s.='<tr>'."\n";
+                        $s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
+                        $s.='<td width="40%" valign="top">';
+                        $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                        $s.="</td>\n</tr>\n";
+                        $cpt2++;
+                    }	// end while()
+                }  // end if()
+            }
+        }
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
+        $js .= $jstmpw;
+        $html .= $s;
+        $html .= '</table></td></tr>' . "\n";
 
         return array($js,$html);
     }
@@ -522,7 +522,7 @@ 
  */
 class ScormAnswerFree extends Answer
 {
-	/**
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -531,24 +531,24 @@ 
      */
     function export()
     {
-    	//$qId = $this->questionJSId;
-    	$js = '';
-    	/*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        //$qId = $this->questionJSId;
+        $js = '';
+        /*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
 		// some javascript must be added for that kind of questions
 		$html .= '<tr><td>
 		    	<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_free" rows="20" cols="100"></textarea>
 		    	</td>
                 </tr>';
 		$html .= '</table></td></tr>';*/
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-    	$js .= $jstmpw;
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+        $js .= $jstmpw;
         return array($js,$html);
     }
 }
@@ -558,40 +558,40 @@ 
  */
 class ScormAnswerHotspot extends Answer
 {
-	/**
-	 * Returns the javascript code that goes with HotSpot exercises
-	 * @return string	The JavaScript code
-	 */
-	function get_js_header()
-	{
-		if ($this->standalone) {
-			$header = '<script type="text/javascript" language="javascript">';
-			$header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
-			$header .= '</script>';
-			//because this header closes so many times the <script> tag, we have to reopen our own
-			$header .= '<script type="text/javascript" language="javascript">'."\n";
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-	    	$header .= $jstmpw;
-		}
-		else
-		{
-			$header = '';
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
-	    	$header .= $jstmpw;
-		}
-		return $header;
-	}
-	/**
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script type="text/javascript" language="javascript">';
+            $header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
+            $header .= '</script>';
+            //because this header closes so many times the <script> tag, we have to reopen our own
+            $header .= '<script type="text/javascript" language="javascript">'."\n";
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+            $header .= $jstmpw;
+        }
+        else
+        {
+            $header = '';
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
+            $header .= $jstmpw;
+        }
+        return $header;
+    }
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -600,22 +600,22 @@ 
      */
     function export()
     {
-    	$js = $this->get_js_header();
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		// some javascript must be added for that kind of questions
-		$html .= '';
+        $js = $this->get_js_header();
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        // some javascript must be added for that kind of questions
+        $html .= '';
 
-		// Get the answers, make a list
-		$nbrAnswers=$this->selectNbrAnswers();
+        // Get the answers, make a list
+        $nbrAnswers=$this->selectNbrAnswers();
 
-		$answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
-		{
-			$answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
-		}
-		$answer_list .= '</ol></div>';
+        $answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
+        for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
+        {
+            $answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
+        }
+        $answer_list .= '</ol></div>';
 
-		/*
+        /*
 		if(!$onlyAnswers)
 		{
 			$s="<tr>
@@ -633,11 +633,11 @@ 
 		}
 		*/
 
-		//$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
-		$canClick = true;
-		//$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
-		//echo $tes;
-		$relPath = api_get_path(REL_PATH);
+        //$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
+        $canClick = true;
+        //$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
+        //echo $tes;
+        $relPath = api_get_path(REL_PATH);
         $html .= <<<HTML
             <tr>
                 <td>
@@ -658,10 +658,10 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></td></tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
 
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
         return array($js,$html);
     }
 }

main/exercice/fill_blanks.class.php

Doc Comments +15 added lines, -14 removed lines

@@ -415,7 +415,7 @@ 
      * @param null $feedback_type
      * @param null $counter
      * @param null $score
-     * @return null|string
+     * @return string
      */
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
@@ -429,15 +429,16 @@ 
     }
 
     /**
-     * @param $separatorStartRegexp
-     * @param $separatorEndRegexp
-     * @param $correctItemRegexp
-     * @param $questionId
+     * @param string $separatorStartRegexp
+     * @param string $separatorEndRegexp
+     * @param string $correctItemRegexp
+     * @param integer $questionId
      * @param $correctItem
      * @param $attributes
-     * @param $answer
+     * @param string $answer
      * @param $listAnswersInfo
-     * @param $displayForStudent
+     * @param boolean $displayForStudent
+     * @param integer $inBlankNumber
      * @return string
      */
     public static function getFillTheBlankHtml(
@@ -736,11 +737,11 @@ 
     *  0  : student answer is correct
     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
     *
-    * @param $testId
-    * @param $questionId
+    * @param integer $testId
+    * @param integer $questionId
     * @param $studentsIdList
-    * @param $startDate
-    * @param $endDate
+    * @param string $startDate
+    * @param string $endDate
     * @param bool $useLastAnswerredAttempt
     * @return array
     * (
@@ -917,7 +918,7 @@ 
      * return $text protected for use in regexp
      * @param string $text
      *
-     * @return mixed
+     * @return string
      */
     public static function getRegexpProtected($text)
     {
@@ -975,7 +976,7 @@ 
      * return the start separator for answer
      * @param string $number
      *
-     * @return mixed
+     * @return string
      */
     public static function getStartSeparator($number)
     {
@@ -988,7 +989,7 @@ 
      * return the end separator for answer
      * @param string $number
      *
-     * @return mixed
+     * @return string
      */
     public static function getEndSeparator($number)
     {

Indentation +68 added lines, -68 removed lines

@@ -729,43 +729,43 @@ 
     }
     
     /**
-    * Return an array of student state answers for fill the blank questions
-    * for each students that answered the question
-    * -2  : didn't answer
-    * -1  : student answer is wrong
-    *  0  : student answer is correct
-    * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
-    *
-    * @param $testId
-    * @param $questionId
-    * @param $studentsIdList
-    * @param $startDate
-    * @param $endDate
-    * @param bool $useLastAnswerredAttempt
-    * @return array
-    * (
-    *     [student_id] => Array
-    *         (
-    *             [first fill the blank for question] => -1
-    *             [second fill the blank for question] => 2
-    *             [third fill the blank for question] => -1
-    *         )
-    * )
-    */
+     * Return an array of student state answers for fill the blank questions
+     * for each students that answered the question
+     * -2  : didn't answer
+     * -1  : student answer is wrong
+     *  0  : student answer is correct
+     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
+     *
+     * @param $testId
+     * @param $questionId
+     * @param $studentsIdList
+     * @param $startDate
+     * @param $endDate
+     * @param bool $useLastAnswerredAttempt
+     * @return array
+     * (
+     *     [student_id] => Array
+     *         (
+     *             [first fill the blank for question] => -1
+     *             [second fill the blank for question] => 2
+     *             [third fill the blank for question] => -1
+     *         )
+     * )
+     */
     public static function getFillTheBlankTabResult($testId, $questionId, $studentsIdList, $startDate, $endDate, $useLastAnswerredAttempt = true) {
 
-       $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-       $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-       $courseId = api_get_course_int_id();
+        $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $courseId = api_get_course_int_id();
 
-       require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
+        require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
 
-       // request to have all the answers of student for this question
-       // student may have doing it several time
-       // student may have not answered the bracket id, in this case, is result of the answer is empty
+        // request to have all the answers of student for this question
+        // student may have doing it several time
+        // student may have not answered the bracket id, in this case, is result of the answer is empty
 
-       // we got the less recent attempt first
-       $sql = '
+        // we got the less recent attempt first
+        $sql = '
            SELECT * FROM '.$tblTrackEAttempt.' tea
 
            LEFT JOIN '.$tblTrackEExercise.' tee
@@ -781,49 +781,49 @@ 
            ORDER BY user_id, tea.exe_id;
        ';
 
-       $res = Database::query($sql);
-       $tabUserResult = array();
-       $bracketNumber = 0;
-       // foreach attempts for all students starting with his older attempt
-       while ($data = Database::fetch_array($res)) {
-           $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
+        $res = Database::query($sql);
+        $tabUserResult = array();
+        $bracketNumber = 0;
+        // foreach attempts for all students starting with his older attempt
+        while ($data = Database::fetch_array($res)) {
+            $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
 
-           // for each bracket to find in this question
-           foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
+            // for each bracket to find in this question
+            foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
 
-               if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
-                   // student has answered this bracket, cool
-                   switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
-                       case self::FILL_THE_BLANK_MENU :
+                if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
+                    // student has answered this bracket, cool
+                    switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
+                        case self::FILL_THE_BLANK_MENU :
                            // get the indice of the choosen answer in the menu
                            // we know that the right answer is the first entry of the menu, ie 0
                            // (remember, menu entries are shuffled when taking the test)
                            $tabUserResult[$data['user_id']][$bracketNumber] = FillBlanks::getFillTheBlankMenuAnswerNum($tabAnswer['tabwords'][$bracketNumber], $tabAnswer['studentanswer'][$bracketNumber]);
-                           break;
-                       default :
+                            break;
+                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
-                           } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
-                           }
-                   }
-               } else {
-                   // student didn't answer this bracket
-                   if ($useLastAnswerredAttempt) {
-                       // if we take into account the last answered attempt
-                       if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                       }
-                   } else {
-                       // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                   }
-               }
-           }
-
-
-       }
-       return $tabUserResult;
+                                $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                            } else {
+                                $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                            }
+                    }
+                } else {
+                    // student didn't answer this bracket
+                    if ($useLastAnswerredAttempt) {
+                        // if we take into account the last answered attempt
+                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
+                            $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                        }
+                    } else {
+                        // we take the last attempt, even if the student answer the question before
+                        $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                    }
+                }
+            }
+
+
+        }
+        return $tabUserResult;
     }
 
 

Spacing +32 added lines, -32 removed lines

@@ -260,10 +260,10 @@ 
             ['id' => 'answer', 'onkeyup' => "javascript: updateBlanks(this);"],
             array('ToolbarSet' => 'TestQuestionDescription')
         );
-        $form->addRule('answer',get_lang('GiveText'),'required');
+        $form->addRule('answer', get_lang('GiveText'), 'required');
 
         //added multiple answers
-        $form->addElement('checkbox','multiple_answer','', get_lang('FillInBlankSwitchable'));
+        $form->addElement('checkbox', 'multiple_answer', '', get_lang('FillInBlankSwitchable'));
         $form->addElement(
             'select',
             'select_separator',
@@ -276,11 +276,11 @@ 
             null,
             '<input type="button" onclick="updateBlanks()" value="'.get_lang('RefreshBlanks').'" class="btn btn-default" />'
         );
-        $form->addElement('html','<div id="blanks_weighting"></div>');
+        $form->addElement('html', '<div id="blanks_weighting"></div>');
 
         global $text;
         // setting the save button here and not in the question class.php
-        $form->addElement('html','<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
+        $form->addElement('html', '<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
         $form->addButtonSave($text, 'submitQuestion');
 
         if (!empty($this->id)) {
@@ -320,7 +320,7 @@ 
         // remove spaces at the beginning and the end of text in square brackets
         $answer = preg_replace_callback(
             "/".$blankStartSeparatorRegexp."[^]]+".$blankEndSeparatorRegexp."/",
-            function ($matches) use ($blankStartSeparator, $blankEndSeparator) {
+            function($matches) use ($blankStartSeparator, $blankEndSeparator) {
                 $matchingResult = $matches[0];
                 $matchingResult = trim($matchingResult, $blankStartSeparator);
                 $matchingResult = trim($matchingResult, $blankEndSeparator);
@@ -365,7 +365,7 @@ 
         if ($nb > 0) {
             $answer .= '::';
             // weighting
-            for ($i=0; $i < $nb; ++$i) {
+            for ($i = 0; $i < $nb; ++$i) {
                 // enter the weighting of word $i
                 $answer .= $form->getSubmitValue('weighting['.$i.']');
                 // not the last word, add ","
@@ -378,7 +378,7 @@ 
 
             // input width
             $answer .= ":";
-            for ($i=0; $i < $nb; ++$i) {
+            for ($i = 0; $i < $nb; ++$i) {
                 // enter the width of input for word $i
                 $answer .= $form->getSubmitValue('sizeofinput['.$i.']');
                 // not the last word, add ","
@@ -403,7 +403,7 @@ 
 
         // Allow answers order switches
         $is_multiple = $form -> getSubmitValue('multiple_answer');
-        $answer.= '@'.$is_multiple;
+        $answer .= '@'.$is_multiple;
 
         $this->save();
         $objAnswer = new Answer($this->id);
@@ -420,7 +420,7 @@ 
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="'.$this->question_table_class .'">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
                 <th>'.get_lang("Answer").'</th>
             </tr>';
@@ -464,13 +464,13 @@ 
                 // if display for student, shuffle the correct answer menu
                 $listMenu = self::getFillTheBlankMenuAnswers($inTeacherSolution, $displayForStudent);
                 $result .= '<select name="choice['.$questionId.'][]">';
-                for ($k=0; $k < count($listMenu); $k++) {
+                for ($k = 0; $k < count($listMenu); $k++) {
                     $selected = "";
                     if ($correctItem == $listMenu[$k]) {
                         $selected = " selected=selected ";
                     }
                     // if in teacher view, display the first item by default, which is the right answer
-                    if ($k==0 && !$displayForStudent) {
+                    if ($k == 0 && !$displayForStudent) {
                         $selected = " selected=selected ";
                     }
                     $optionMenu .= '<option '.$selected.' value="'.$listMenu[$k].'">'.$listMenu[$k].'</option>';
@@ -642,10 +642,10 @@ 
         if (count($listDetails) < 3) {
             $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = array();
-            for ($i=0; $i < count($listWeightings); $i++) {
+            for ($i = 0; $i < count($listWeightings); $i++) {
                 $listSizeOfInput[] = 200;
             }
-            $blankSeparatorNumber = 0;    // 0 is [...]
+            $blankSeparatorNumber = 0; // 0 is [...]
         } else {
             $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = explode(',', $listDetails[1]);
@@ -677,9 +677,9 @@ 
             // remove [ and ] in string
             array_walk(
                 $listWords[0],
-                function (&$value, $key, $tabBlankChar) {
+                function(&$value, $key, $tabBlankChar) {
                     $trimChars = "";
-                    for ($i=0; $i < count($tabBlankChar); $i++) {
+                    for ($i = 0; $i < count($tabBlankChar); $i++) {
                         $trimChars .= $tabBlankChar[$i];
                     }
                     $value = trim($value, $trimChars);
@@ -699,18 +699,18 @@ 
         // if student answer, the second [] is the student answer,
         // the third is if student scored or not
         $listBrackets = array();
-        $listWords =  array();
+        $listWords = array();
 
         if ($isStudentAnswer) {
-            for ($i=0; $i < count($listAnswerResults['tabwords']); $i++) {
+            for ($i = 0; $i < count($listAnswerResults['tabwords']); $i++) {
                 $listBrackets[] = $listAnswerResults['tabwordsbracket'][$i];
                 $listWords[] = $listAnswerResults['tabwords'][$i];
-                if ($i+1 < count($listAnswerResults['tabwords'])) {
+                if ($i + 1 < count($listAnswerResults['tabwords'])) {
                     // should always be
                     $i++;
                 }
                 $listAnswerResults['studentanswer'][] = $listAnswerResults['tabwords'][$i];
-                if ($i+1 < count($listAnswerResults['tabwords'])) {
+                if ($i + 1 < count($listAnswerResults['tabwords'])) {
                     // should always be
                     $i++;
                 }
@@ -802,9 +802,9 @@ 
                            break;
                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                               $tabUserResult[$data['user_id']][$bracketNumber] = 0; //  right answer
                            } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                               $tabUserResult[$data['user_id']][$bracketNumber] = -1; // wrong answer
                            }
                    }
                } else {
@@ -812,11 +812,11 @@ 
                    if ($useLastAnswerredAttempt) {
                        // if we take into account the last answered attempt
                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                           $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered
                        }
                    } else {
                        // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                       $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered
                    }
                }
            }
@@ -837,10 +837,10 @@ 
     {
         $outRes = 0;
         // for each student in group
-        foreach($resultList as $userId => $tabValue) {
+        foreach ($resultList as $userId => $tabValue) {
             $trouve = false;
             // for each bracket, if student has at leat one answer ( choice > -2) then he pass the question
-            foreach($tabValue as $i => $choice) {
+            foreach ($tabValue as $i => $choice) {
                 if ($choice > -2 && !$trouve) {
                     $outRes++;
                     $trouve = true;
@@ -862,7 +862,7 @@ 
         $separatorEnd = $listWithStudentAnswer['blankseparatorend'];
         // lets rebuild the sentence with [correct answer][student answer][answer is correct]
         $result = "";
-        for ($i=0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) {
+        for ($i = 0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) {
             $result .= $listWithStudentAnswer['commonwords'][$i];
             $result .= $listWithStudentAnswer['tabwordsbracket'][$i];
             $result .= $separatorStart.$listWithStudentAnswer['studentanswer'][$i].$separatorEnd;
@@ -944,7 +944,7 @@ 
             ")",
         ];
         $result = $text;
-        for ($i=0; $i < count($listRegexpCharacters); $i++) {
+        for ($i = 0; $i < count($listRegexpCharacters); $i++) {
             $result = str_replace($listRegexpCharacters[$i], "\\".$listRegexpCharacters[$i], $result);
         }
 
@@ -1006,7 +1006,7 @@ 
     {
         $listResults = array();
         $fillBlanksAllowedSeparator = self::getAllowedSeparator();
-        for ($i=0; $i < count($fillBlanksAllowedSeparator); $i++) {
+        for ($i = 0; $i < count($fillBlanksAllowedSeparator); $i++) {
             $listResults[] = $fillBlanksAllowedSeparator[$i][0]."...".$fillBlanksAllowedSeparator[$i][1];
         }
 
@@ -1024,7 +1024,7 @@ 
     {
         $listSeparators = self::getAllowedSeparator();
         $result = 0;
-        for ($i=0; $i < count($listSeparators); $i++) {
+        for ($i = 0; $i < count($listSeparators); $i++) {
             if ($listSeparators[$i][0] == $startSeparator &&
                 $listSeparators[$i][1] == $endSeparator
             ) {
@@ -1049,7 +1049,7 @@ 
 
         // rebuild the answer with good HTML style
         // this is the student answer, right or wrong
-        for ($i=0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) {
+        for ($i = 0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) {
             if ($listStudentAnswerInfo['studentscore'][$i] == 1) {
                 $listStudentAnswerInfo['studentanswer'][$i] = self::getHtmlRightAnswer(
                     $listStudentAnswerInfo['studentanswer'][$i],
@@ -1067,7 +1067,7 @@ 
 
 
         // rebuild the sentence with student answer inserted
-        for ($i=0; $i < count($listStudentAnswerInfo['commonwords']); $i++) {
+        for ($i = 0; $i < count($listStudentAnswerInfo['commonwords']); $i++) {
             $result .= isset($listStudentAnswerInfo['commonwords'][$i]) ? $listStudentAnswerInfo['commonwords'][$i] : '';
             $result .= isset($listStudentAnswerInfo['studentanswer'][$i]) ? $listStudentAnswerInfo['studentanswer'][$i] : '';
         }
@@ -1100,7 +1100,7 @@ 
                 $listPossibleAnswers = FillBlanks::getFillTheBlankMenuAnswers($correct, false);
                 $correctAnswerHtml .= "<span style='color: green'>".$listPossibleAnswers[0]."</span>";
                 $correctAnswerHtml .= " <span style='font-weight:normal'>(";
-                for ($i=1; $i < count($listPossibleAnswers); $i++) {
+                for ($i = 1; $i < count($listPossibleAnswers); $i++) {
                     $correctAnswerHtml .= $listPossibleAnswers[$i];
                     if ($i != count($listPossibleAnswers) - 1) {
                         $correctAnswerHtml .= " | ";

main/exercice/hotpotatoes.lib.php

Doc Comments +5 added lines, -1 removed lines

@@ -94,7 +94,7 @@ 
  * Sets the comment in the database for a particular path.
  * @param    string    File path
  * @param    string    Comment to set
- * @return   string    Result of the database operation (Database::query will output some message directly on error anyway)
+ * @return   Doctrine\DBAL\Driver\Statement|null    Result of the database operation (Database::query will output some message directly on error anyway)
  */
 function SetComment($path, $comment)
 {
@@ -112,6 +112,7 @@ 
 /**
  * Reads the file contents into a string.
  * @param    string    Urlencoded path
+ * @param string $full_file_path
  * @return   string    The file contents or false on security error
  */
 function ReadFileCont($full_file_path)
@@ -257,6 +258,7 @@ 
  * Searches for a node in the given array.
  * @param    reference    Reference to the array to search
  * @param    string       Node we are looking for in the array
+ * @param string $node
  * @return   mixed        Node name or false if not found
  */
 function myarraysearch(&$array, $node)
@@ -316,6 +318,8 @@ 
  * Fills the folder name up to a certain length with "0".
  * @param    string    Original folder name
  * @param    integer   Length to reach
+ * @param integer $name
+ * @param integer $nsize
  * @return   string    Modified folder name
  */
 function FillFolderName($name, $nsize)

Indentation +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
                     if (is_dir($full_name)) {
                         $filelist[] = $file;
                     }
-               }
+                }
             }
         }
     }

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
     if ($title == '') {
         $title = basename($fname);
     }
-    return (string)$title;
+    return (string) $title;
 }
 
 /**
@@ -176,7 +176,7 @@ 
         if ($src == '') {
             return '';
         } else {
-            $tmp_src = basename($src) ;
+            $tmp_src = basename($src);
             if ($tmp_src == '') {
                 return $src;
             } else {
@@ -198,7 +198,7 @@ 
 {
     // Select src tag from img tag.
     $match = array();
-    preg_match("|(src=\".*\" )|U", $imgtag, $match);            //src
+    preg_match("|(src=\".*\" )|U", $imgtag, $match); //src
     list($key, $srctag) = each($match);
     $src = substr($srctag, 5, (strlen($srctag) - 7));
     if (stristr($src, 'http') === false) {
@@ -230,8 +230,8 @@ 
         while (list($key, $imgtag) = each($match)) {
             $imgname = GetImgName($imgtag);
             if ($imgname != '' && !in_array($imgname, $imgparams)) {
-                array_push($imgparams, $imgname);    // name (+ type) of the images in the html test
-                $imgcount = $imgcount + 1;            // number of images in the html test
+                array_push($imgparams, $imgname); // name (+ type) of the images in the html test
+                $imgcount = $imgcount + 1; // number of images in the html test
             }
         }
     }
@@ -404,7 +404,7 @@ 
                 if ($file != '..') {
                     $full_name = $folder.'/'.$file;
                     if (is_dir($full_name)) {
-                        $dflag = 1;    // first directory
+                        $dflag = 1; // first directory
                     }
                 }
             }

main/exercice/hotpotatoes_exercise_result.class.php

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
 	 * Gets the results of all students (or just one student if access is limited)
 	 * @param	string		The document path (for HotPotatoes retrieval)
 	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+	 * @param string $document_path
 	 */
 	public function getExercisesReporting($document_path, $hotpotato_name)
     {

Indentation +136 added lines, -136 removed lines

@@ -14,14 +14,14 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -33,7 +33,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -110,25 +110,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path='', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -147,7 +147,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -156,25 +156,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -182,40 +182,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -224,37 +224,37 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+            $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
                 $column++;
             } else {
@@ -263,36 +263,36 @@ 
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
@@ -309,38 +309,38 @@ 
                     $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
-			$column++;
             $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -23,13 +23,13 @@ 
     {
 		$return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
-        $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
+        $TBL_TRACK_HOTPOTATOES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
         $cid             = api_get_course_id();
         $course_id       = api_get_course_int_id();
         //$user_id         = intval($user_id);
         $user_id = null;
-        $session_id_and  = ' AND te.session_id = ' . api_get_session_id() . ' ';
+        $session_id_and  = ' AND te.session_id = '.api_get_session_id().' ';
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
@@ -37,7 +37,7 @@ 
         }
 
         if (empty($user_id)) {
-            $sql="SELECT firstname as userpart1, lastname as userpart2 ,
+            $sql = "SELECT firstname as userpart1, lastname as userpart2 ,
                     email,
                     tth.exe_name,
                     tth.exe_result,
@@ -49,13 +49,13 @@ 
                             tth.exe_name = '$hotpotato_name'
                     ORDER BY tth.c_id ASC, tth.exe_date ASC";
         } else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
             // get only this user's results
 
             $sql = "SELECT '', exe_name, exe_result , exe_weighting, exe_date
                     FROM $TBL_TRACK_HOTPOTATOES
                     WHERE
-                        exe_user_id = '" . $user_id . "' AND
+                        exe_user_id = '".$user_id."' AND
                         c_id = $course_id AND
                         tth.exe_name = '$hotpotato_name'
                     ORDER BY c_id ASC, exe_date ASC";
@@ -64,13 +64,13 @@ 
         $results = array();
 
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $results[] = $rowx;
         }
 
         $hpresults = array();
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $hpresults[] = $rowx;
         }
 
@@ -89,19 +89,19 @@ 
 
         // Print the Result of Hotpotatoes Tests
         if (is_array($hpresults)) {
-            for($i = 0; $i < sizeof($hpresults); $i++) {
+            for ($i = 0; $i < sizeof($hpresults); $i++) {
                 $return[$i] = array();
                 $title = GetQuizName($hpresults[$i]['exe_name'], $document_path);
-                if ($title =='') {
+                if ($title == '') {
                     $title = basename($hpresults[$i]['exe_name']);
                 }
-                if(empty($user_id)) {
+                if (empty($user_id)) {
                 $return[$i]['email'] = $hpresults[$i]['email'];
                     $return[$i]['first_name'] = $hpresults[$i]['userpart1'];
                     $return[$i]['last_name'] = $hpresults[$i]['userpart2'];
                 }
                 $return[$i]['title'] = $title;
-                $return[$i]['exe_date']  = $hpresults[$i]['exe_date'];
+                $return[$i]['exe_date'] = $hpresults[$i]['exe_date'];
 
                 $return[$i]['result'] = $hpresults[$i]['exe_result'];
                 $return[$i]['max'] = $hpresults[$i]['exe_weighting'];
@@ -120,7 +120,7 @@ 
 	 * @param	boolean		Whether to include user fields or not
 	 * @return	boolean		False on error
 	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
 		global $charset;
 		$this->getExercisesReporting($document_path, $hotpotato_name);
@@ -131,17 +131,17 @@ 
 		$data = '';
 
         if (api_is_western_name_order()) {
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
@@ -163,16 +163,16 @@ 
 		$data .= "\n";
 
 		//results
-		foreach($this->results as $row) {
+		foreach ($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
-            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
 			/*if ($export_user_fields) {
 				//show user fields data, if any, for this user
@@ -182,10 +182,10 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
+			$data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+			$data .= str_replace("\r\n", '  ', $row['exe_date']).';';
+			$data .= str_replace("\r\n", '  ', $row['result']).';';
+			$data .= str_replace("\r\n", '  ', $row['max']).';';
 			$data .= "\n";
 		}
 
@@ -207,7 +207,7 @@ 
 		header('Content-Description: '.$filename);
 		header('Content-transfer-encoding: binary');
 		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+		echo "\xEF\xBB\xBF"; // force utf-8 header of csv file
 		echo $data;
 		return true;
 	}
@@ -249,25 +249,25 @@ 
 		}
 
 		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+		    $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Email'));
 		    $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
     			$column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
             } else {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
                 $column++;
             }
 		}
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 
 			//show the fields names for user fields
 			foreach ($extra_user_fields as $field) {
@@ -276,63 +276,63 @@ 
 			}
 		}
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('EndDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
 		$column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
 		$line++;
 
 		foreach ($this->results as $row) {
 			$column = 0;
 
             if ($with_column_user) {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
 
                 if (api_is_western_name_order()) {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
                 } else {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
 			}
 
 			if ($export_user_fields) {
 				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
 					$column++;
 				}
 			}
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+			$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['end_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['duration']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['result']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['max']);
 			$column++;
-            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
+            $worksheet->SetCellValueByColumnAndRow($line, $column, $row['status']);
 			$line++;
 		}
 

main/exercice/hotspot.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	/**
 	 * @param FormValidator $form
 	 * @param null $objExercise
-	 * @return bool
+	 * @return null|false
 	 */
 	public function processCreation($form, $objExercise = null)
 	{

Indentation +102 added lines, -102 removed lines

@@ -12,78 +12,78 @@ 
  **/
 class HotSpot extends Question
 {
-	static $typePicture = 'hotspot.png';
-	static $explanationLangVar = 'HotSpot';
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT;
-	}
-
-	public function display()
-	{
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param int $fck_config
-	 */
-	public function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm($form, $fck_config);
-
-		if (!isset($_GET['editQuestion'])) {
-			$form->addElement('file','imageUpload',array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')) );
-
-			// setting the save button here and not in the question class.php
-			// Saving a question
-			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
-			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
-		} else {
-			// setting the save button here and not in the question class.php
-			// Editing a question
-			$form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
-		}
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param null $objExercise
-	 * @return bool
-	 */
-	public function processCreation($form, $objExercise = null)
-	{
-		$file_info = $form->getSubmitValue('imageUpload');
-		$_course = api_get_course_info();
-		parent::processCreation($form, $objExercise);
-
-		if(!empty($file_info['tmp_name'])) {
-			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
-			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$picturePath   = $documentPath.'/images';
-
-			// fixed width ang height
-			if (file_exists($picturePath.'/'.$this->picture)) {
-				$this->resizePicture('width', 800);
-				$this->save();
-			} else {
-				return false;
-			}
-		}
-	}
-
-	function createAnswersForm ($form)
-	{
-		// nothing
-	}
-
-	function processAnswersCreation ($form)
-	{
-		// nothing
-	}
+    static $typePicture = 'hotspot.png';
+    static $explanationLangVar = 'HotSpot';
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT;
+    }
+
+    public function display()
+    {
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param int $fck_config
+     */
+    public function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm($form, $fck_config);
+
+        if (!isset($_GET['editQuestion'])) {
+            $form->addElement('file','imageUpload',array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')) );
+
+            // setting the save button here and not in the question class.php
+            // Saving a question
+            $form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            //$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            $form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+            $form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
+        } else {
+            // setting the save button here and not in the question class.php
+            // Editing a question
+            $form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
+        }
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param null $objExercise
+     * @return bool
+     */
+    public function processCreation($form, $objExercise = null)
+    {
+        $file_info = $form->getSubmitValue('imageUpload');
+        $_course = api_get_course_info();
+        parent::processCreation($form, $objExercise);
+
+        if(!empty($file_info['tmp_name'])) {
+            $this->uploadPicture($file_info['tmp_name'], $file_info['name']);
+            $documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $picturePath   = $documentPath.'/images';
+
+            // fixed width ang height
+            if (file_exists($picturePath.'/'.$this->picture)) {
+                $this->resizePicture('width', 800);
+                $this->save();
+            } else {
+                return false;
+            }
+        }
+    }
+
+    function createAnswersForm ($form)
+    {
+        // nothing
+    }
+
+    function processAnswersCreation ($form)
+    {
+        // nothing
+    }
 }
 
 /**
@@ -91,35 +91,35 @@ 
  */
 class HotSpotDelineation extends HotSpot
 {
-	static $typePicture = 'hotspot-delineation.png';
-	static $explanationLangVar = 'HotspotDelineation';
-
-	function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT_DELINEATION;
-
-	}
-
-	function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm ($form, $fck_config);
-	}
-
-	function processCreation ($form, $objExercise = null)
-	{
-		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
-	}
-
-	function createAnswersForm ($form)
-	{
-		parent::createAnswersForm ($form);
-	}
-
-	function processAnswersCreation ($form)
-	{
-		parent::processAnswersCreation ($form);
-	}
+    static $typePicture = 'hotspot-delineation.png';
+    static $explanationLangVar = 'HotspotDelineation';
+
+    function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT_DELINEATION;
+
+    }
+
+    function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm ($form, $fck_config);
+    }
+
+    function processCreation ($form, $objExercise = null)
+    {
+        $file_info = $form -> getSubmitValue('imageUpload');
+        parent::processCreation ($form, $objExercise);
+    }
+
+    function createAnswersForm ($form)
+    {
+        parent::createAnswersForm ($form);
+    }
+
+    function processAnswersCreation ($form)
+    {
+        parent::processAnswersCreation ($form);
+    }
 }
 

Spacing +14 added lines, -14 removed lines

@@ -29,18 +29,18 @@ 
 	 * @param FormValidator $form
 	 * @param int $fck_config
 	 */
-	public function createForm (&$form, $fck_config=0)
+	public function createForm(&$form, $fck_config = 0)
 	{
 		parent::createForm($form, $fck_config);
 
 		if (!isset($_GET['editQuestion'])) {
-			$form->addElement('file','imageUpload',array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')) );
+			$form->addElement('file', 'imageUpload', array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')));
 
 			// setting the save button here and not in the question class.php
 			// Saving a question
 			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
 			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array('jpg', 'jpeg', 'png', 'gif'));
 			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
 		} else {
 			// setting the save button here and not in the question class.php
@@ -60,7 +60,7 @@ 
 		$_course = api_get_course_info();
 		parent::processCreation($form, $objExercise);
 
-		if(!empty($file_info['tmp_name'])) {
+		if (!empty($file_info['tmp_name'])) {
 			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
 			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 			$picturePath   = $documentPath.'/images';
@@ -75,12 +75,12 @@ 
 		}
 	}
 
-	function createAnswersForm ($form)
+	function createAnswersForm($form)
 	{
 		// nothing
 	}
 
-	function processAnswersCreation ($form)
+	function processAnswersCreation($form)
 	{
 		// nothing
 	}
@@ -101,25 +101,25 @@ 
 
 	}
 
-	function createForm (&$form, $fck_config=0)
+	function createForm(&$form, $fck_config = 0)
 	{
-		parent::createForm ($form, $fck_config);
+		parent::createForm($form, $fck_config);
 	}
 
-	function processCreation ($form, $objExercise = null)
+	function processCreation($form, $objExercise = null)
 	{
 		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
+		parent::processCreation($form, $objExercise);
 	}
 
-	function createAnswersForm ($form)
+	function createAnswersForm($form)
 	{
-		parent::createAnswersForm ($form);
+		parent::createAnswersForm($form);
 	}
 
-	function processAnswersCreation ($form)
+	function processAnswersCreation($form)
 	{
-		parent::processAnswersCreation ($form);
+		parent::processAnswersCreation($form);
 	}
 }