chamilo / chamilo-lms

main/exercise/export/qti2/qti2_export.php

Indentation +159 added lines, -159 removed lines

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

main/exercise/answer.class.php

Indentation +319 added lines, -319 removed lines

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

main/ticket/status.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         "categories.php?action=delete&id={$row['id']}"
     );
 
-	return $result;
+    return $result;
 }
 
 Display::display_header($plugin->get_lang('MyTickets'));

main/ticket/priorities.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         "categories.php?action=delete&id={$row['id']}"
     );
 
-	return $result;
+    return $result;
 }
 
 Display::display_header($plugin->get_lang('MyTickets'));

main/exercise/TestCategory.php

Indentation +32 added lines, -32 removed lines

@@ -15,8 +15,8 @@ 
     public $name;
     public $description;
 
-	/**
-	 * Constructor of the class Category
+    /**
+     * Constructor of the class Category
      */
     public function __construct()
     {
@@ -49,9 +49,9 @@ 
         return  false;
     }
 
-	/**
+    /**
      * add TestCategory in the database if name doesn't already exists
-	 */
+     */
     public function addCategoryInBDD()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -110,7 +110,7 @@ 
         $category = $this->getCategory($id);
 
         if ($category) {
-           $sql = "DELETE FROM $table
+            $sql = "DELETE FROM $table
                    WHERE id= $id AND c_id=".$course_id;
             Database::query($sql);
 
@@ -132,11 +132,11 @@ 
         }
 
         return false;
-	}
+    }
 
-	/**
+    /**
      * Modify category name or description of category with id=in_id
-	 */
+     */
     public function modifyCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -167,30 +167,30 @@ 
         }
 
         return false;
-	}
+    }
 
-	/**
+    /**
      * Gets the number of question of category id=in_id
-	 */
+     */
     public function getCategoryQuestionsNumber()
     {
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
-		$in_id = intval($this->id);
-		$sql = "SELECT count(*) AS nb
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $in_id = intval($this->id);
+        $sql = "SELECT count(*) AS nb
 		        FROM $table
 		        WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
-		$res = Database::query($sql);
-		$row = Database::fetch_array($res);
+        $res = Database::query($sql);
+        $row = Database::fetch_array($res);
 
-		return $row['nb'];
-	}
+        return $row['nb'];
+    }
 
-	/**
+    /**
      * Return an array of all Category objects in the database
-	 * If in_field=="" Return an array of all category objects in the database
-	 * Otherwise, return an array of all in_field value
-	 * in the database (in_field = id or name or description)
-	 *
+     * If in_field=="" Return an array of all category objects in the database
+     * Otherwise, return an array of all in_field value
+     * in the database (in_field = id or name or description)
+     *
      * @param string $in_field
      * @param int $courseId
      * @return array
@@ -493,10 +493,10 @@ 
      * @param int exercise
      * @param array $check_in_question_list
      * @param array $categoriesAddedInExercise
-    *
-    * @param int $exerciseId
-    * @return array
-    */
+     *
+     * @param int $exerciseId
+     * @return array
+     */
     static function getQuestionsByCat(
         $exerciseId,
         $check_in_question_list = array(),
@@ -622,9 +622,9 @@ 
     }
 
     /**
-    * Display signs [+] and/or (>0) after question title if question has options
-    * scoreAlwaysPositive and/or uncheckedMayScore
-    */
+     * Display signs [+] and/or (>0) after question title if question has options
+     * scoreAlwaysPositive and/or uncheckedMayScore
+     */
     public function displayQuestionOption($in_objQuestion)
     {
         if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
@@ -640,7 +640,7 @@ 
      * key of $tabCategoryQuestions are the category id (0 for not in a category)
      * value is the array of question id of this category
      * Sort question by Category
-    */
+     */
     public static function sortTabByBracketLabel($in_tab)
     {
         $tabResult = array();
@@ -693,7 +693,7 @@ 
      * count the number of questions in all categories, and return the max
      * @param int $exerciseId
      * @author - hubert borderiou
-    */
+     */
     public static function getNumberMaxQuestionByCat($exerciseId)
     {
         $res_num_max = 0;

main/gradebook/lib/fe/dataform.class.php

Indentation +12 added lines, -12 removed lines

@@ -8,19 +8,19 @@
  */
 class DataForm extends FormValidator
 {
-	const TYPE_IMPORT = 1;
-	const TYPE_EXPORT = 2;
-	const TYPE_EXPORT_PDF = 3;
+    const TYPE_IMPORT = 1;
+    const TYPE_EXPORT = 2;
+    const TYPE_EXPORT_PDF = 3;
 
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1=import, 2=export
-	 * @param obj cat_obj the category object
-	 * @param obj res_obj the result object
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1=import, 2=export
+     * @param obj cat_obj the category object
+     * @param obj res_obj the result object
+     * @param string form name
+     * @param method
+     * @param action
+     */
     public function __construct($form_type, $form_name, $method = 'post', $action = null, $target = '', $locked_status)
     {
         parent:: __construct($form_name, $method, $action, $target);

main/exercise/result.php

Indentation +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     $htmlHeadXtra[] = '<style>
         body { background: none;}
     </style>';
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 
 $message = Session::read('attempt_remaining');

main/exercise/export/scorm/scorm_classes.php

Indentation +773 added lines, -773 removed lines

@@ -20,140 +20,140 @@ 
 {
     public $js_id;
     public $answer;
-	/**
-	 * Returns the HTML + JS flow corresponding to one question
-	 *
-	 * @param int $questionId The question ID
-	 * @param bool $standalone (ie including XML tag, DTD declaration, etc)
-	 * @param int  $js_id 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
+    /**
+     * Returns the HTML + JS flow corresponding to one question
+     *
+     * @param int $questionId The question ID
+     * @param bool $standalone (ie including XML tag, DTD declaration, etc)
+     * @param int  $js_id 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
      * @return string|array
-	 */
-	public static function export_question($questionId, $standalone = true, $js_id)
-	{
-		$question = new ScormQuestion();
-		$qst = $question->read($questionId);
-		if (!$qst) {
-			return '';
-		}
-		$question->id = $qst->id;
-		$question->js_id = $js_id;
-		$question->type = $qst->type;
-		$question->question = $qst->question;
-		$question->description = $qst->description;
-		$question->weighting=$qst->weighting;
-		$question->position=$qst->position;
-		$question->picture=$qst->picture;
-		$assessmentItem = new ScormAssessmentItem($question, $standalone);
-
-		return $assessmentItem->export();
-	}
-
-	/**
-	 * 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:
-			case GLOBAL_MULTIPLE_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_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);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case MATCHING:
-			case MATCHING_DRAGGABLE:
-			case DRAGGABLE:
-				$this->answer = new ScormAnswerMatching($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case ORAL_EXPRESSION:
-			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);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case MULTIPLE_ANSWER_COMBINATION:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_ORDER:
-				$this->answer = new ScormAnswerHotspot($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_DELINEATION:
-				$this->answer = new ScormAnswerHotspot($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			// not supported
-			case UNIQUE_ANSWER_NO_OPTION:
-			case MULTIPLE_ANSWER_TRUE_FALSE:
-			case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
-			case UNIQUE_ANSWER_IMAGE:
-			case CALCULATED_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			default:
-				$this->answer = new stdClass();
-				$this->answer->questionJSId = $this->js_id;
-				break;
-		}
-
-		return true;
-	}
-
-	function export()
-	{
-		$html = $this->getQuestionHTML();
-		$js = $this->getQuestionJS();
-
-		if (is_object($this->answer) && $this->answer instanceof Answer) {
-			list($js2, $html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		} else {
-			throw new \Exception('Question not supported. Exercise: '.$this->selectTitle());
-		}
-
-		return array($js, $html);
-	}
-
-	function createAnswersForm($form)
-	{
-		return true;
-	}
-
-	function processAnswersCreation($form)
-	{
-		return true;
-	}
-
-	/**
-	 * Returns an HTML-formatted question
-	 */
-	function getQuestionHTML()
-	{
+     */
+    public static function export_question($questionId, $standalone = true, $js_id)
+    {
+        $question = new ScormQuestion();
+        $qst = $question->read($questionId);
+        if (!$qst) {
+            return '';
+        }
+        $question->id = $qst->id;
+        $question->js_id = $js_id;
+        $question->type = $qst->type;
+        $question->question = $qst->question;
+        $question->description = $qst->description;
+        $question->weighting=$qst->weighting;
+        $question->position=$qst->position;
+        $question->picture=$qst->picture;
+        $assessmentItem = new ScormAssessmentItem($question, $standalone);
+
+        return $assessmentItem->export();
+    }
+
+    /**
+     * 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:
+            case GLOBAL_MULTIPLE_ANSWER:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_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);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case MATCHING:
+            case MATCHING_DRAGGABLE:
+            case DRAGGABLE:
+                $this->answer = new ScormAnswerMatching($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case ORAL_EXPRESSION:
+            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);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case MULTIPLE_ANSWER_COMBINATION:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case HOT_SPOT_ORDER:
+                $this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case HOT_SPOT_DELINEATION:
+                $this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            // not supported
+            case UNIQUE_ANSWER_NO_OPTION:
+            case MULTIPLE_ANSWER_TRUE_FALSE:
+            case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
+            case UNIQUE_ANSWER_IMAGE:
+            case CALCULATED_ANSWER:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            default:
+                $this->answer = new stdClass();
+                $this->answer->questionJSId = $this->js_id;
+                break;
+        }
+
+        return true;
+    }
+
+    function export()
+    {
+        $html = $this->getQuestionHTML();
+        $js = $this->getQuestionJS();
+
+        if (is_object($this->answer) && $this->answer instanceof Answer) {
+            list($js2, $html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        } else {
+            throw new \Exception('Question not supported. Exercise: '.$this->selectTitle());
+        }
+
+        return array($js, $html);
+    }
+
+    function createAnswersForm($form)
+    {
+        return true;
+    }
+
+    function processAnswersCreation($form)
+    {
+        return true;
+    }
+
+    /**
+     * Returns an HTML-formatted question
+     */
+    function getQuestionHTML()
+    {
         $title = $this->selectTitle();
         $description = $this->selectDescription();
-		$cols = 2;
-		$s = '<tr>
+        $cols = 2;
+        $s = '<tr>
 			<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">
 			'.$title.'
 			</td>
@@ -163,16 +163,16 @@ 
 			<i>'.$description.'</i>
 			</td>
 			</tr>';
-		return $s;
-	}
+        return $s;
+    }
 
-	/**
-	 * Return the JavaScript code bound to the question
-	 */
-	public function getQuestionJS()
-	{
-		$weight = $this->selectWeighting();
-		$js = 'questions.push('.$this->js_id.');'."\n";
+    /**
+     * Return the JavaScript code bound to the question
+     */
+    public function getQuestionJS()
+    {
+        $weight = $this->selectWeighting();
+        $js = 'questions.push('.$this->js_id.');'."\n";
 
         switch ($this->type) {
             case ORAL_EXPRESSION:
@@ -181,7 +181,7 @@ 
                 $script .= file_get_contents(api_get_path(LIBRARY_PATH) . 'wami-recorder/gui.js');
                 $js .= $script;*/
                 break;
-           case HOT_SPOT:
+            case HOT_SPOT:
                 //put the max score to 0 to avoid discounting the points of
                 //non-exported quiz types in the SCORM
                 $weight = 0;
@@ -189,8 +189,8 @@ 
         }
         $js .= 'questions_score_max['.$this->js_id.'] = '.$weight.";";
 
-		return $js;
-	}
+        return $js;
+    }
 }
 
 /**
@@ -200,29 +200,29 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
-	 */
-	function export()
-	{
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">';
-		$type = $this->getQuestionType();
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();';
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;';
+    /**
+     * Return HTML code for possible answers
+     */
+    function export()
+    {
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        $type = $this->getQuestionType();
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();';
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;';
 
         $jstmpw .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();';
 
-		//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) {
+        //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) {
             $id = 1;
-			$jstmp = '';
-			$jstmpc = '';
+            $jstmp = '';
+            $jstmpc = '';
             foreach ($this->answer as $i => $answer) {
-				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
-				$html .=
-					'<tr>
+                $identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
+                $html .=
+                    '<tr>
 					<td align="center" width="5%">
 					<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />
 					</td>
@@ -231,19 +231,19 @@ 
 					</td>
 					</tr>';
 
-				$jstmp .= $i.',';
+                $jstmp .= $i.',';
                 if ($this->correct[$i]) {
                     $jstmpc .= $i.',';
                 }
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
                 $jstmpw .= 'questions_answers_correct['.$this->questionJSId.']['.$i.'] = '.$this->correct[$i].';';
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
             $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-			$js .= $jstmpw;
-		} elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-	    	$js = '';
+            $js .= $jstmpw;
+        } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
+            $js = '';
             $id = 1;
             $jstmp = '';
             $jstmpc = '';
@@ -270,15 +270,15 @@ 
             $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
             $js .= 'questions_types['.$this->questionJSId.'] = "exact";';
             $js .= $jstmpw;
-		} else {
-			$id = 1;
-			$jstmp = '';
-			$jstmpc = '';
+        } else {
+            $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>
+                $identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
+                $html .=
+                    '<tr>
 					<td align="center" width="5%">
 					<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="checkbox"/>
 					</td>
@@ -286,22 +286,22 @@ 
 					<label for="'.$identifier.'">' . Security::remove_XSS($this->answer[$i]) . '</label>
 					</td>
 					</tr>';
-				$jstmp .= $i.',';
+                $jstmp .= $i.',';
                 if ($this->correct[$i]) {
                     $jstmpc .= $i;
                 }
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
                 $jstmpw .= 'questions_answers_correct['.$this->questionJSId.']['.$i.'] = '.$this->correct[$i].';';
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
-			$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';';
-			$js .= $jstmpw;
-		}
-		$html .= '</table></td></tr>';
-
-		return array($js, $html);
-	}
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';';
+            $js .= $jstmpw;
+        }
+        $html .= '</table></td></tr>';
+
+        return array($js, $html);
+    }
 }
 
 /**
@@ -310,21 +310,21 @@ 
  */
 class ScormAnswerTrueFalse extends Answer
 {
-	/**
-	 * Return the XML flow for the possible answers.
-	 * That's one <response_lid>, containing several <flow_label>
-	 *
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	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>
+    /**
+     * Return the XML flow for the possible answers.
+     * That's one <response_lid>, containing several <flow_label>
+     *
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    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>
 				<td align="center" width="5%">
 				<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" />
 				</td>
@@ -332,8 +332,8 @@ 
 				<label for="'.$identifier_true.'">' . get_lang('True') . '</label>
 				</td>
 				</tr>';
-		$html .=
-			'<tr>
+        $html .=
+            '<tr>
 			<td align="center" width="5%">
 			<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" />
 			</td>
@@ -341,20 +341,20 @@ 
 			<label for="'.$identifier_false.'">' . get_lang('False') . '</label>
 			</td>
 			</tr></table></td></tr>';
-		$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);
-	}
+        $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);
+    }
 }
 
 /**
@@ -363,76 +363,76 @@ 
  */
 class ScormAnswerFillInBlanks extends Answer
 {
-	/**
-	 * Export the text with missing words.
-	 *
-	 * As a side effect, it stores two lists in the class :
-	 * the missing words and their respective weightings.
-	 */
-	function export()
-	{
-		global $charset;
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">';
-		// get all enclosed answers
-		$blankList = array();
-		// build replacement
-		$replacementList = array();
-		foreach ($this->answer as $i => $answer) {
-			$blankList[] = '['.$answer.']';
-		}
-
-		// 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(
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     */
+    function export()
+    {
+        global $charset;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        // get all enclosed answers
+        $blankList = array();
+        // build replacement
+        $replacementList = array();
+        foreach ($this->answer as $i => $answer) {
+            $blankList[] = '['.$answer.']';
+        }
+
+        // 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.',';
-			if (!empty($texstring)) {
-				$sub = api_substr($texstring, 1, -1);
-				if (!empty($sub)) {
-					$jstmpc .= "'" . api_htmlentities($sub, ENT_QUOTES, $charset) . "',";
-				}
-			}
+            if (!empty($texstring)) {
+                $sub = api_substr($texstring, 1, -1);
+                if (!empty($sub)) {
+                    $jstmpc .= "'" . api_htmlentities($sub, 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, ']');
-		}
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $startlocations = api_strpos($answer, '[');
+            $endlocations = api_strpos($answer, ']');
+        }
 
-		$html .= '<tr>
+        $html .= '<tr>
 			<td>
 			'.$answer.'
 			</td>
 			</tr></table></td></tr>';
-		$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;
+        $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);
+    }
 }
 
 /**
@@ -441,65 +441,65 @@ 
  */
 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%">';
-		// 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 ...)
-
-		// get max length of displayed array
-
-		$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>';
-				$s.='<td width="40%" valign="top"><b>'.$cpt2.'</b>.&nbsp;'.$answer."</td>";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
-				// fills the list-box
+    /**
+     * 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%">';
+        // 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 ...)
+
+        // get max length of displayed array
+
+        $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>';
+                $s.='<td width="40%" valign="top"><b>'.$cpt2.'</b>.&nbsp;'.$answer."</td>";
+                $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>';
-				$s.='<td width="40%" valign="top">';
+                $s.='</select>&nbsp;&nbsp;</td>';
+                $s.='<td width="40%" valign="top">';
                 if (isset($Select[$cpt2])) {
                     $s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
                 } else {
                     $s .= '&nbsp;';
                 }
-				$s.="</td></tr>";
+                $s.="</td></tr>";
 
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
 
                 $my_weight = explode('@', $weight);
                 if (count($my_weight) == 2) {
@@ -507,32 +507,32 @@ 
                 } 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>';
-						$s.= '<td width="60%" colspan="2">&nbsp;</td>';
-						$s.= '<td width="40%" valign="top">';
-						$s.= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.= "</td></tr>";
-						$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);
-	}
+                $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>';
+                        $s.= '<td width="60%" colspan="2">&nbsp;</td>';
+                        $s.= '<td width="40%" valign="top">';
+                        $s.= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                        $s.= "</td></tr>";
+                        $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);
+    }
 }
 
 /**
@@ -541,19 +541,19 @@ 
  */
 class ScormAnswerFree extends Answer
 {
-	/**
-	 * Export the text with missing words.
-	 *
-	 * As a side effect, it stores two lists in the class :
-	 * the missing words and their respective weightings.
-	 *
-	 */
-	function export()
-	{
-		$js = '';
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = '';
         $identifier = 'question_'.$this->questionJSId.'_free';
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">';
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">';
         $type = $this->getQuestionType();
 
         if ($type == ORAL_EXPRESSION) {
@@ -565,21 +565,21 @@ 
             $layout = $template->get_template('document/record_audio.tpl');
             $html .= $template->fetch($layout);*/
 
-			$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+            $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 
             return array($js, $html);
         }
 
         $html .= '<textarea minlength="20" name="'.$identifier.'" id="'.$identifier.'" ></textarea>';
         $html .= '</td></tr>';
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array();';
-		$js .= 'questions_answers_correct['.$this->questionJSId.'] = "";';
-		$js .= 'questions_types['.$this->questionJSId.'] = \'free\';';
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = "0";';
-		$js .= $jstmpw;
-
-		return array($js, $html);
-	}
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array();';
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = "";';
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';';
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = "0";';
+        $js .= $jstmpw;
+
+        return array($js, $html);
+    }
 }
 /**
  * This class handles the SCORM export of hotpot questions
@@ -587,63 +587,63 @@ 
  */
 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>';
-			$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>';
-			$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 :
-	 * the missing words and their respective weightings.
-	 *
-	 */
-	function export()
-	{
-		$js = $this->get_js_header();
-		$html = '<tr><td colspan="2"><table width="100%">';
-		// some javascript must be added for that kind of questions
-		$html .= '';
-
-		// 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>';
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script>';
+            $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>';
+            $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 :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = $this->get_js_header();
+        $html = '<tr><td colspan="2"><table width="100%">';
+        // some javascript must be added for that kind of questions
+        $html .= '';
+
+        // 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>';
-		$canClick = true;
-		$relPath = api_get_path(REL_PATH);
-		$html .= <<<HTML
+        $canClick = true;
+        $relPath = api_get_path(REL_PATH);
+        $html .= <<<HTML
             <tr>
                 <td>
                     <div id="hotspot-{$this->questionJSId}"></div>
@@ -663,13 +663,13 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></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>';
+        // 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);
+    }
 }
 
 /**
@@ -684,32 +684,32 @@ 
  */
 class ScormAssessmentItem
 {
-	public $question;
-	public $question_ident;
-	public $answer;
-	public $standalone;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param ScormQuestion $question The Question object we want to export.
-	 */
-	public function __construct($question, $standalone = false)
-	{
-		$this->question = $question;
-		$this->question->setAnswer();
-		$this->questionIdent = "QST_" . $question->id ;
-		$this->standalone = $standalone;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
+    public $question;
+    public $question_ident;
+    public $answer;
+    public $standalone;
+
+    /**
+     * Constructor.
+     *
+     * @param ScormQuestion $question The Question object we want to export.
+     */
+    public function __construct($question, $standalone = false)
+    {
+        $this->question = $question;
+        $this->question->setAnswer();
+        $this->questionIdent = "QST_" . $question->id ;
+        $this->standalone = $standalone;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
         $head = '';
         if ($this->standalone) {
             $charset = 'UTF-8';
@@ -717,89 +717,89 @@ 
             $head .= '<html>';
         }
 
-		return $head;
-	}
+        return $head;
+    }
 
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        if ($this->standalone) {
+            return '</html>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        if ($this->standalone) {
+            return '<head>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    function css()
+    {
+        $css = '';
+        if ($this->standalone) {
+            $css = '<style type="text/css" media="screen, projection">';
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>'."\n";
+            $css .= '<style type="text/css" media="print">';
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>';
+        }
+
+        return $css;
+    }
+
+    /**
+     * End document header
+     */
+    function end_header()
+    {
+        if ($this->standalone) {
+            return '</head>';
+        }
+
+        return '';
+    }
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_js()
     {
-		if ($this->standalone) {
-			return '</html>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		if ($this->standalone) {
-			return '<head>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	function css()
-	{
-		$css = '';
-		if ($this->standalone) {
-			$css = '<style type="text/css" media="screen, projection">';
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>'."\n";
-			$css .= '<style type="text/css" media="print">';
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * End document header
-	 */
-	function end_header()
-	{
-		if ($this->standalone) {
-			return '</head>';
-		}
-
-		return '';
-	}
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_js()
-	{
         $js = '<script type="text/javascript" src="assets/api_wrapper.js"></script>';
-		if ($this->standalone) {
-			return '<script>';
-		}
-		return $js;
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	function common_js()
-	{
-		$js = 'var questions = new Array();';
-		$js .= 'var questions_answers = new Array();';
-		$js .= 'var questions_answers_correct = new Array();';
-		$js .= 'var questions_types = new Array();';
-		$js .= "\n" .
-			'/**
+        if ($this->standalone) {
+            return '<script>';
+        }
+        return $js;
+    }
+
+    /**
+     * Common JS functions
+     */
+    function common_js()
+    {
+        $js = 'var questions = new Array();';
+        $js .= 'var questions_answers = new Array();';
+        $js .= 'var questions_answers_correct = new Array();';
+        $js .= 'var questions_types = new Array();';
+        $js .= "\n" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -834,79 +834,79 @@ 
             	addEvent(window,\'unload\',unloadPage,false);
             }'."\n\n";
 
-		$js .= '';
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        $js .= '';
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
         if ($this->standalone) {
             return $js."\n";
         }
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
-	{
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
         if ($this->standalone) {
             return '</script>';
         }
 
         return '';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		if ($this->standalone) {
-			return '<body><form id="dokeos_scorm_form" method="post" action="">';
-		}
-
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		if ($this->standalone) {
-			return '<br /><input class="btn" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Export the question as a SCORM Item.
-	 * This is a default behaviour, some classes may want to override this.
-	 * @return string|array A string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		list($js, $html) = $this->question->export();
-		if ($this->standalone) {
-			$res = $this->start_page()
-				. $this->start_header()
-				. $this->css()
-				. $this->start_js()
-				. $this->common_js()
-				. $js
-				. $this->end_js()
-				. $this->end_header()
-				. $this->start_body()
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        if ($this->standalone) {
+            return '<body><form id="dokeos_scorm_form" method="post" action="">';
+        }
+
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        if ($this->standalone) {
+            return '<br /><input class="btn" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Export the question as a SCORM Item.
+     * This is a default behaviour, some classes may want to override this.
+     * @return string|array A string, the XML flow for an Item.
+     */
+    function export()
+    {
+        list($js, $html) = $this->question->export();
+        if ($this->standalone) {
+            $res = $this->start_page()
+                . $this->start_header()
+                . $this->css()
+                . $this->start_js()
+                . $this->common_js()
+                . $js
+                . $this->end_js()
+                . $this->end_header()
+                . $this->start_body()
                 . $html
-				. $this->end_body()
-				. $this->end_page();
-			return $res;
-		} else {
-			return array($js, $html);
-		}
-	}
+                . $this->end_body()
+                . $this->end_page();
+            return $res;
+        } else {
+            return array($js, $html);
+        }
+    }
 }
 
 /**
@@ -923,103 +923,103 @@ 
  */
 class ScormSection
 {
-	public $exercise;
-	public $standalone;
-
-	/**
-	 * Send a complete exercise in SCORM format, from its ID
-	 *
-	 * @param Exercise $exercise The exercise to export
-	 * @param boolean $standalone Wether it should include XML tag and DTD line.
-	 * @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(Exercise $exercise, $standalone = true)
-	{
-		$ims = new ScormSection($exercise);
-		$xml = $ims->export($standalone);
-
-		return $xml;
-	}
-
-	/**
-	 * Constructor.
-	 * @param Exercise $exe The Exercise instance to export
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	public function __construct($exe)
-	{
-		$this->exercise = $exe;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
+    public $exercise;
+    public $standalone;
+
+    /**
+     * Send a complete exercise in SCORM format, from its ID
+     *
+     * @param Exercise $exercise The exercise to export
+     * @param boolean $standalone Wether it should include XML tag and DTD line.
+     * @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(Exercise $exercise, $standalone = true)
+    {
+        $ims = new ScormSection($exercise);
+        $xml = $ims->export($standalone);
+
+        return $xml;
+    }
+
+    /**
+     * Constructor.
+     * @param Exercise $exe The Exercise instance to export
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    public function __construct($exe)
+    {
+        $this->exercise = $exe;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
         $charset = 'UTF-8';
-		$head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
-
-		return $head;
-	}
-
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
-	{
-		return '</html>';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		return '<head>';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	private function css()
-	{
-		return '';
-	}
-
-	/**
-	 * End document header
-	 */
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
+
+        return $head;
+    }
+
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        return '</html>';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        return '<head>';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    private function css()
+    {
+        return '';
+    }
+
+    /**
+     * End document header
+     */
     private function end_header()
-	{
-		return '</head>';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
+    {
+        return '</head>';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
     private function start_js()
-	{
-		return '<script>';
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	public function common_js()
-	{
-		$js = file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.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" .
-			'/**
+    {
+        return '<script>';
+    }
+
+    /**
+     * Common JS functions
+     */
+    public function common_js()
+    {
+        $js = file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.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" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -1061,76 +1061,76 @@ 
             }
             '."\n";
 
-		$js .= '';
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-		return $js. "\n";
-	}
+        $js .= '';
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        return $js. "\n";
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
+        return '</script>';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        return '<body>'.
+        '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>".
+        '<form id="dokeos_scorm_form" method="post" action="">'.
+        '<table width="100%">';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        return '</table><br /><input class="btn btn-primary" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
+    }
 
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
+    /**
+     * Export the question as a SCORM Item.
+     *
+     * This is a default behaviour, some classes may want to override this.
+     *
+     * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+     * @return string string, the XML flow for an Item.
+     */
+    function export()
     {
-		return '</script>';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		return '<body>'.
-		'<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>".
-		'<form id="dokeos_scorm_form" method="post" action="">'.
-		'<table width="100%">';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		return '</table><br /><input class="btn btn-primary" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
-	}
-
-	/**
-	 * Export the question as a SCORM Item.
-	 *
-	 * This is a default behaviour, some classes may want to override this.
-	 *
-	 * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-	 * @return string string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		global $charset;
-
-		$head = '';
-		if ($this->standalone) {
-			$head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
-				. '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
-		}
-
-		list($js, $html) = $this->export_questions();
-		$res = $this->start_page()
-			. $this->start_header()
-			. $this->css()
+        global $charset;
+
+        $head = '';
+        if ($this->standalone) {
+            $head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
+                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
+        }
+
+        list($js, $html) = $this->export_questions();
+        $res = $this->start_page()
+            . $this->start_header()
+            . $this->css()
             . $this->globalAssets()
-			. $this->start_js()
-			. $this->common_js()
-			. $js
-			. $this->end_js()
-			. $this->end_header()
-			. $this->start_body()
-			. $html
-			. $this->end_body()
-			. $this->end_page();
-
-		return $res;
-	}
+            . $this->start_js()
+            . $this->common_js()
+            . $js
+            . $this->end_js()
+            . $this->end_header()
+            . $this->start_body()
+            . $html
+            . $this->end_body()
+            . $this->end_page();
+
+        return $res;
+    }
 
     /**
      * @return string
@@ -1144,21 +1144,21 @@ 
         return $assets;
     }
 
-	/**
-	 * Export the questions, as a succession of <items>
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	function export_questions()
-	{
-		$js = $html = "";
-		$js_id = 0;
-		foreach ($this->exercise->selectQuestionList() as $q) {
-			list($jstmp, $htmltmp)= ScormQuestion::export_question($q, false, $js_id);
-			$js .= $jstmp."\n";
-			$html .= $htmltmp."\n";
-			++$js_id;
-		}
-
-		return array($js, $html);
-	}
+    /**
+     * Export the questions, as a succession of <items>
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    function export_questions()
+    {
+        $js = $html = "";
+        $js_id = 0;
+        foreach ($this->exercise->selectQuestionList() as $q) {
+            list($jstmp, $htmltmp)= ScormQuestion::export_question($q, false, $js_id);
+            $js .= $jstmp."\n";
+            $html .= $htmltmp."\n";
+            ++$js_id;
+        }
+
+        return array($js, $html);
+    }
 }

main/ticket/tickets.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
         echo '<div class="actions" >';
         echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id='.$projectId.'">' .
                 Display::return_icon('add.png', get_lang('Add'), '', '32') .
-             '</a>';
+                '</a>';
         echo '</div>';
     }
 }