chamilo / chamilo-lms

main/lp/lp_edit.php

Indentation +4 added lines, -4 removed lines

@@ -160,8 +160,8 @@ 
 $form->addElement('checkbox', 'activate_start_date_check', null,get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
 $display_date = 'none';
 if ($publicated_on!='0000-00-00 00:00:00' && !empty($publicated_on)) {
-	$display_date = 'block';
-	$defaults['activate_start_date_check'] = 1;
+    $display_date = 'block';
+    $defaults['activate_start_date_check'] = 1;
 }
 
 $form->addElement('html','<div id="start_date_div" style="display:'.$display_date.';">');
@@ -172,8 +172,8 @@ 
 $form->addElement('checkbox', 'activate_end_date_check',  null, get_lang('EnableEndTime'),  array('onclick' => 'activate_end_date()'));
 $display_date = 'none';
 if ($expired_on!='0000-00-00 00:00:00' && !empty($expired_on)) {
-	$display_date = 'block';
-	$defaults['activate_end_date_check'] = 1;
+    $display_date = 'block';
+    $defaults['activate_end_date_check'] = 1;
 }
 
 $form->addElement('html','<div id="end_date_div" style="display:'.$display_date.';">');

main/lp/resourcelinker.php

Indentation +5 added lines, -5 removed lines

@@ -308,11 +308,11 @@
         //$_SESSION['addedresourceid']=null;
         // cleaning up the session once again
         $_SESSION['addedresource'] = null;
-           $_SESSION['addedresourceid'] = null;
-           $_SESSION['addedresourceassigned'] = null;
-           unset ($_SESSION['addedresource']);
-           unset ($_SESSION['addedresourceid']);
-           unset ($_SESSION['addedresourceassigned']);
+            $_SESSION['addedresourceid'] = null;
+            $_SESSION['addedresourceassigned'] = null;
+            unset ($_SESSION['addedresource']);
+            unset ($_SESSION['addedresourceid']);
+            unset ($_SESSION['addedresourceassigned']);
     }
 }
 

main/lp/lp_impress.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     api_get_group_id()
 );
 if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
-     api_not_allowed();
+        api_not_allowed();
 }
 
 if (empty($_SESSION['oLP'])) {

main/lp/lp_add_audio.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 // Using the resource linker as a tool for adding resources to the learning path.
 if ($action == 'add' && $type == 'learnpathitem') {
-     $htmlHeadXtra[] = "<script>
+        $htmlHeadXtra[] = "<script>
      window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\";
      </script>";
 }

main/lp/openoffice_document.class.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         // Create the directory
         $result = $this->generate_lp_folder($_course, $this->file_name);
 
-         // Create the directory
+            // Create the directory
         $this->base_work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
         ///learning_path/ppt_dirname directory
         $this->created_dir = substr($result['dir'], 0, strlen($result['dir']) -1);

main/gradebook/lib/be/learnpathlink.class.php

Indentation +243 added lines, -243 removed lines

@@ -9,261 +9,261 @@
  */
 class LearnpathLink extends AbstractLink
 {
-	private $course_info = null;
-	private $learnpath_table = null;
-	private $learnpath_data = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_LEARNPATH);
-	}
-
-	/**
-	 * Generate an array of learnpaths that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
-
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
+    private $course_info = null;
+    private $learnpath_table = null;
+    private $learnpath_data = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_LEARNPATH);
+    }
+
+    /**
+     * Generate an array of learnpaths that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code))
+            die('Error in get_not_created_links() : course code not set');
+
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
 				WHERE c_id = '.$this->course_id.' AND id NOT IN '
-			.' (SELECT ref_id FROM '.$tbl_grade_links
-			.' WHERE type = '.LINK_LEARNPATH
-			." AND course_code = '".$this->get_course_code()."'"
-			.') AND lp.session_id='.api_get_session_id().'';
-
-		$result = Database::query($sql);
-
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
-		}
-
-		return $cats;
-	}
-
-	/**
-	 * Generate an array of all learnpaths available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
-
-		$session_id = api_get_session_id();
-		if (empty($session_id)) {
-			$session_condition = api_get_session_condition(0, true);
-		} else {
-			$session_condition = api_get_session_condition($session_id, true, true);
-		}
-
-		$sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
+            .' (SELECT ref_id FROM '.$tbl_grade_links
+            .' WHERE type = '.LINK_LEARNPATH
+            ." AND course_code = '".$this->get_course_code()."'"
+            .') AND lp.session_id='.api_get_session_id().'';
+
+        $result = Database::query($sql);
+
+        $cats=array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['name']);
+        }
+
+        return $cats;
+    }
+
+    /**
+     * Generate an array of all learnpaths available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code))
+            die('Error in get_not_created_links() : course code not set');
+
+        $session_id = api_get_session_id();
+        if (empty($session_id)) {
+            $session_condition = api_get_session_condition(0, true);
+        } else {
+            $session_condition = api_get_session_condition($session_id, true, true);
+        }
+
+        $sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' '.$session_condition.' ';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		$cats = array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
-		}
+        $cats = array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['name']);
+        }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
 
-	/**
-	 * Has anyone used this learnpath yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
-		$sql = "SELECT count(id) AS number FROM $tbl_stats
+    /**
+     * Has anyone used this learnpath yet ?
+     */
+    public function has_results()
+    {
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
+        $sql = "SELECT count(id) AS number FROM $tbl_stats
 				WHERE c_id = ".$this->course_id." AND lp_id = ".$this->get_ref_id();
-		$result = Database::query($sql);
-		$number = Database::fetch_array($result,'NUM');
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Get the progress of this learnpath. Only the last attempt are taken into account.
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
-		$session_id = api_get_session_id();
-
-		$sql = "SELECT * FROM $tbl_stats
+        $result = Database::query($sql);
+        $number = Database::fetch_array($result,'NUM');
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Get the progress of this learnpath. Only the last attempt are taken into account.
+     * @param $stud_id student id (default: all students who have results - then the average is returned)
+     * @return	array (score, max) if student is given
+     * 			array (sum of scores, number of scores) otherwise
+     * 			or null if no scores available
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
+        $session_id = api_get_session_id();
+
+        $sql = "SELECT * FROM $tbl_stats
                 WHERE
                 	c_id = ".$this->course_id." AND
                     lp_id = ".$this->get_ref_id()." AND
                     session_id = $session_id ";
 
-		if (isset($stud_id))
-			$sql .= ' AND user_id = '.intval($stud_id);
-
-		// order by id, that way the student's first attempt is accessed first
-		$sql .= ' ORDER BY view_count DESC';
-
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
-			if ($data = Database::fetch_assoc($scores)) {
-				return array ($data['progress'], 100);
-			} else
-				return null;
-		} else {
-			// all students -> get average
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$sumResult = 0;
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					$students[$data['user_id']] = $data['progress'];
-					$rescount++;
-					$sum += $data['progress'] / 100;
-					$sumResult += $data['progress'];
-
-					if ($data['progress'] > $bestResult) {
-						$bestResult = $data['progress'];
-					}
-				}
-			}
-
-			if ($rescount == 0) {
-				return null;
-			} else {
-
-				switch ($type) {
-					case 'best':
-						return array($bestResult, 100);
-						break;
-					case 'average':
-						return array($sumResult/$rescount, 100);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get URL where to go to if the user clicks on the link.
-	 */
-	public function get_link()
-	{
-		$session_id = api_get_session_id();
-		$url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
-
-		if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
-			$url .= '&action=view&lp_id='.$this->get_ref_id();
-		} else {
-			$url .= '&action=build&lp_id='.$this->get_ref_id();
-		}
-		return $url;
-	}
-
-	/**
-	 * Get name to display: same as learnpath title
-	 */
-	public function get_name()
-	{
-		$data = $this->get_learnpath_data();
-		return $data['name'];
-	}
-
-	/**
-	 * Get description to display: same as learnpath description
-	 */
-	public function get_description()
-	{
-		$data = $this->get_learnpath_data();
-		return $data['description'];
-	}
-
-	/**
-	 * Check if this still links to a learnpath
-	 */
-	public function is_valid_link() {
-		$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
+        if (isset($stud_id))
+            $sql .= ' AND user_id = '.intval($stud_id);
+
+        // order by id, that way the student's first attempt is accessed first
+        $sql .= ' ORDER BY view_count DESC';
+
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
+            if ($data = Database::fetch_assoc($scores)) {
+                return array ($data['progress'], 100);
+            } else
+                return null;
+        } else {
+            // all students -> get average
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $sumResult = 0;
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    $students[$data['user_id']] = $data['progress'];
+                    $rescount++;
+                    $sum += $data['progress'] / 100;
+                    $sumResult += $data['progress'];
+
+                    if ($data['progress'] > $bestResult) {
+                        $bestResult = $data['progress'];
+                    }
+                }
+            }
+
+            if ($rescount == 0) {
+                return null;
+            } else {
+
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, 100);
+                        break;
+                    case 'average':
+                        return array($sumResult/$rescount, 100);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get URL where to go to if the user clicks on the link.
+     */
+    public function get_link()
+    {
+        $session_id = api_get_session_id();
+        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
+
+        if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
+            $url .= '&action=view&lp_id='.$this->get_ref_id();
+        } else {
+            $url .= '&action=build&lp_id='.$this->get_ref_id();
+        }
+        return $url;
+    }
+
+    /**
+     * Get name to display: same as learnpath title
+     */
+    public function get_name()
+    {
+        $data = $this->get_learnpath_data();
+        return $data['name'];
+    }
+
+    /**
+     * Get description to display: same as learnpath description
+     */
+    public function get_description()
+    {
+        $data = $this->get_learnpath_data();
+        return $data['description'];
+    }
+
+    /**
+     * Check if this still links to a learnpath
+     */
+    public function is_valid_link() {
+        $sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result,'NUM');
-		return ($number[0] != 0);
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('LearningPaths');
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	// INTERNAL FUNCTIONS
-
-	/**
-	 * Lazy load function to get the database table of the learnpath
-	 */
-	private function get_learnpath_table()
-	{
-		$this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
-		return $this->learnpath_table;
-	}
-
-	/**
-	 * Lazy load function to get the database contents of this learnpath
-	 */
-	private function get_learnpath_data()
-	{
-		if (!isset($this->learnpath_data)) {
-			$sql = 'SELECT * FROM '.$this->get_learnpath_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result,'NUM');
+        return ($number[0] != 0);
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('LearningPaths');
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    // INTERNAL FUNCTIONS
+
+    /**
+     * Lazy load function to get the database table of the learnpath
+     */
+    private function get_learnpath_table()
+    {
+        $this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
+        return $this->learnpath_table;
+    }
+
+    /**
+     * Lazy load function to get the database contents of this learnpath
+     */
+    private function get_learnpath_data()
+    {
+        if (!isset($this->learnpath_data)) {
+            $sql = 'SELECT * FROM '.$this->get_learnpath_table().'
                     WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
-			$result = Database::query($sql);
-			$this->learnpath_data = Database::fetch_array($result);
-		}
-		return $this->learnpath_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'learnpath';
-	}
+            $result = Database::query($sql);
+            $this->learnpath_data = Database::fetch_array($result);
+        }
+        return $this->learnpath_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'learnpath';
+    }
 }

main/exercise/exercise_result.php

Indentation +15 added lines, -15 removed lines

@@ -59,7 +59,7 @@ 
 
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 if (!empty($gradebook) && $gradebook=='view') {
     $interbreadcrumb[] = array(
@@ -79,8 +79,8 @@ 
 $htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
 
 if ($origin != 'learnpath') {
-	// So we are not in learnpath tool
-	Display::display_header($nameTools, get_lang('Exercise'));
+    // So we are not in learnpath tool
+    Display::display_header($nameTools, get_lang('Exercise'));
 } else {
     $htmlHeadXtra[] = "
     <style>
@@ -94,19 +94,19 @@ 
 
 // I'm in a preview mode as course admin. Display the action menu.
 if (api_is_course_admin() && $origin != 'learnpath') {
-	echo '<div class="actions">';
-	echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
+    echo '<div class="actions">';
+    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>';
-	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
+    echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>';
-	echo '</div>';
+    echo '</div>';
 }
 
 $feedback_type = $objExercise->feedback_type;
 $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
 
 if (!empty($exercise_stat_info['data_tracking'])) {
-	$question_list = explode(',', $exercise_stat_info['data_tracking']);
+    $question_list = explode(',', $exercise_stat_info['data_tracking']);
 }
 
 $learnpath_id = $exercise_stat_info['orig_lp_id'];
@@ -201,19 +201,19 @@ 
         Session::erase('objExercise');
         Session::erase('exe_id');
     }
-	Display::display_footer();
+    Display::display_footer();
 } else {
-	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
-	$url = '../lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
+    $lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
+    $url = '../lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
+    $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
 
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');
         Session::erase('exe_id');
     }
 
-	// Record the results in the learning path, using the SCORM interface (API)
-	echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
+    // Record the results in the learning path, using the SCORM interface (API)
+    echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
     echo '<script type="text/javascript">'.$href.'</script>';
-	echo '</body></html>';
+    echo '</body></html>';
 }

main/exercise/export/scorm/scorm_classes.php

Indentation +940 added lines, -940 removed lines

@@ -18,156 +18,156 @@ 
  */
 class ScormQuestion extends Question
 {
-	/**
-	 * Returns the HTML + JS flow corresponding to one question
-	 *
-	 * @param int The question ID
-	 * @param bool standalone (ie including XML tag, DTD declaration, etc)
-	 * @param int  The JavaScript ID for this question.
-	 * Due to the nature of interactions, we must have a natural sequence for
-	 * questions in the generated JavaScript.
-	 * @param integer $js_id
-	 */
-	public static function export_question($questionId, $standalone = true, $js_id)
-	{
-		$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);
-		//echo "<pre>".print_r($scorm,1)."</pre>";exit;
-		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;
-			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)) {
-			list($js2, $html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		}
-
-		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>' .
-			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
-			$title.
-			'</td>' . "\n" .
-			'</tr>' . "\n" .
-			'<tr>' . "\n" .
-			'<td valign="top" colspan="'.$cols.'">' . "\n" .
-			'<i>'.$description.'</i>' . "\n" .
-			'</td>' . "\n" .
-			'</tr>' . "\n";
-		return $s;
-	}
-
-	/**
-	 * Return the JavaScript code bound to the question
-	 */
-	function getQuestionJS()
-	{
-		//$id = $this->id;
-		$w = $this->selectWeighting();
-		$s = 'questions.push('.$this->js_id.');'."\n";
-		if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
-		{ //put the max score to 0 to avoid discounting the points of
-			//non-exported quiz types in the SCORM
-			$w=0;
-		}
-		$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
-		return $s;
-	}
+    /**
+     * Returns the HTML + JS flow corresponding to one question
+     *
+     * @param int The question ID
+     * @param bool standalone (ie including XML tag, DTD declaration, etc)
+     * @param int  The JavaScript ID for this question.
+     * Due to the nature of interactions, we must have a natural sequence for
+     * questions in the generated JavaScript.
+     * @param integer $js_id
+     */
+    public static function export_question($questionId, $standalone = true, $js_id)
+    {
+        $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);
+        //echo "<pre>".print_r($scorm,1)."</pre>";exit;
+        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;
+            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)) {
+            list($js2, $html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        }
+
+        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>' .
+            '<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
+            $title.
+            '</td>' . "\n" .
+            '</tr>' . "\n" .
+            '<tr>' . "\n" .
+            '<td valign="top" colspan="'.$cols.'">' . "\n" .
+            '<i>'.$description.'</i>' . "\n" .
+            '</td>' . "\n" .
+            '</tr>' . "\n";
+        return $s;
+    }
+
+    /**
+     * Return the JavaScript code bound to the question
+     */
+    function getQuestionJS()
+    {
+        //$id = $this->id;
+        $w = $this->selectWeighting();
+        $s = 'questions.push('.$this->js_id.');'."\n";
+        if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
+        { //put the max score to 0 to avoid discounting the points of
+            //non-exported quiz types in the SCORM
+            $w=0;
+        }
+        $s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
+        return $s;
+    }
 }
 
 /**
@@ -177,110 +177,110 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
-	 */
-	function export()
-	{
-		$html = '';
-		$js   = '';
-		$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		$type = $this->getQuestionType();
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-
-		//not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
-		//if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-		if ($type == MCMA ) {
-			//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
-			$id = 1;
-			$jstmp = '';
-			$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
-			{
-				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
-				$html .=
-					'<tr>' . "\n"
-					.	'<td align="center" width="5%">' . "\n"
-					.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
-					.	'</td>' . "\n"
-					.	'<td width="95%">' . "\n"
-					.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-					.	'</td>' . "\n"
-					.	'</tr>' . "\n\n";
-				$jstmp .= $i.',';
-				if($this->correct[$i])
-				{
-					$jstmpc .= $i.',';
-				}
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-			$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
-			if ($type == MCMA) {
-				$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-			} else {
-				$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-			}
-			$js .= $jstmpw;
-		} elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-			//To this items we show the ThisItemIsNotExportable
-			$qId = $this->questionJSId;
-			$js = '';
-			$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-			// some javascript must be added for that kind of questions
-			$html .= '<tr>' . "\n"
-				.	'<td>' . "\n"
-				. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
-				.	'</td>' . "\n"
-				.	'</tr>' . "\n";
-			$html .= '</table></td></tr>' . "\n";
-			// currently the exact answers cannot be displayed, so ignore the textarea
-			$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-			$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-			$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-			$js .= $jstmpw;
-			return array($js,$html);
-		} else {
-			//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
-			$id = 1;
-			$jstmp = '';
-			$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
-			{
-				$identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
-				$identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
-				$html .=
-					'<tr>' . "\n"
-					.	'<td align="center" width="5%">' . "\n"
-					.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
-					.	'</td>' . "\n"
-					.	'<td width="95%">' . "\n"
-					.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-					.	'</td>' . "\n"
-					.	'</tr>' . "\n\n";
-				$jstmp .= $i.',';
-				if($this->correct[$i])
-				{
-					$jstmpc .= $i;
-				}
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-			$js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
-			$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
-			$js .= $jstmpw;
-		}
-		$html .= '</table></td></tr>' . "\n";
-
-		return array($js,$html);
-	}
+    /**
+     * Return HTML code for possible answers
+     */
+    function export()
+    {
+        $html = '';
+        $js   = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        $type = $this->getQuestionType();
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+
+        //not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
+        //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
+        if ($type == MCMA ) {
+            //$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            foreach( $this->answer as $i => $answer )
+            {
+                $identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
+                $html .=
+                    '<tr>' . "\n"
+                    .	'<td align="center" width="5%">' . "\n"
+                    .	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
+                    .	'</td>' . "\n"
+                    .	'<td width="95%">' . "\n"
+                    .	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
+                    .	'</td>' . "\n"
+                    .	'</tr>' . "\n\n";
+                $jstmp .= $i.',';
+                if($this->correct[$i])
+                {
+                    $jstmpc .= $i.',';
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+            if ($type == MCMA) {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
+            } else {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+            }
+            $js .= $jstmpw;
+        } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
+            //To this items we show the ThisItemIsNotExportable
+            $qId = $this->questionJSId;
+            $js = '';
+            $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+            // some javascript must be added for that kind of questions
+            $html .= '<tr>' . "\n"
+                .	'<td>' . "\n"
+                . '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n";
+            $html .= '</table></td></tr>' . "\n";
+            // currently the exact answers cannot be displayed, so ignore the textarea
+            $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+            $js .= $jstmpw;
+            return array($js,$html);
+        } else {
+            //$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            foreach( $this->answer as $i => $answer )
+            {
+                $identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
+                $identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
+                $html .=
+                    '<tr>' . "\n"
+                    .	'<td align="center" width="5%">' . "\n"
+                    .	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
+                    .	'</td>' . "\n"
+                    .	'<td width="95%">' . "\n"
+                    .	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
+                    .	'</td>' . "\n"
+                    .	'</tr>' . "\n\n";
+                $jstmp .= $i.',';
+                if($this->correct[$i])
+                {
+                    $jstmpc .= $i;
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
+            $js .= $jstmpw;
+        }
+        $html .= '</table></td></tr>' . "\n";
+
+        return array($js,$html);
+    }
 }
 
 /**
@@ -289,54 +289,54 @@ 
  */
 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>' . "\n"
-			.	'<td align="center" width="5%">' . "\n"
-			.	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
-			.		'/>' . "\n"
-			.	'</td>' . "\n"
-			.	'<td width="95%">' . "\n"
-			.	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
-			.	'</td>' . "\n"
-			.	'</tr>' . "\n\n";
-		$html .=
-			'<tr>' . "\n"
-			.	'<td align="center" width="5%">' . "\n"
-			.	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
-			.		'/>' . "\n"
-			.	'</td>' . "\n"
-			.	'<td width="95%">' . "\n"
-			.	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
-			.	'</td>' . "\n"
-			.	'</tr>' . "\n\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
-		$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if ($this->response == 'TRUE') {
-			$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
-		} else {
-			$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
-		}
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
-		$js .= $jstmpw;
-
-		return array($js,$html);
-	}
+    /**
+     * 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>' . "\n"
+            .	'<td align="center" width="5%">' . "\n"
+            .	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
+            .		'/>' . "\n"
+            .	'</td>' . "\n"
+            .	'<td width="95%">' . "\n"
+            .	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
+            .	'</td>' . "\n"
+            .	'</tr>' . "\n\n";
+        $html .=
+            '<tr>' . "\n"
+            .	'<td align="center" width="5%">' . "\n"
+            .	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
+            .		'/>' . "\n"
+            .	'</td>' . "\n"
+            .	'<td width="95%">' . "\n"
+            .	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
+            .	'</td>' . "\n"
+            .	'</tr>' . "\n\n";
+        $html .= '</table></td></tr>' . "\n";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
+        if ($this->response == 'TRUE') {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
+        } else {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
+        }
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
+        $js .= $jstmpw;
+
+        return array($js,$html);
+    }
 }
 
 /**
@@ -345,68 +345,68 @@ 
  */
 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%">' . "\n";
-		// get all enclosed answers
-		$blankList = array();
-		// build replacement
-		$replacementList = array();
-		foreach ($this->answer as $i => $answer) {
-			$blankList[] = '['.$answer.']';
-		}
-		$answerCount = count($blankList);
-
-		// splits text and weightings that are joined with the character '::'
-		list($answer,$weight)=explode('::',$answer);
-		$weights = explode(',',$weight);
-		// because [] is parsed here we follow this procedure:
-		// 1. find everything between the [ and ] tags
-		$i=1;
-		$jstmp = '';
-		$jstmpc = '';
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$startlocations=api_strpos($answer,'[');
-		$endlocations=api_strpos($answer,']');
-		while($startlocations !== false && $endlocations !== false) {
-			$texstring = api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
-			$jstmp .= $i.',';
-			$jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
-			$my_weight=explode('@',$weights[$i-1]);
-			if (count($my_weight)==2) {
-				$weight_db=$my_weight[0];
-			} else {
-				$weight_db=$my_weight[0];
-			}
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
-			$i++;
-			$startlocations = api_strpos($answer, '[');
-			$endlocations = api_strpos($answer, ']');
-		}
-
-		$html .= 	'<tr>' . "\n"
-			.	'<td>' . "\n"
-			.	$answer  . "\n"
-			.	'</td>' . "\n"
-			.	'</tr>' . "\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
-		$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
-		$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
-		$js .= $jstmpw;
-
-		return array($js,$html);
-	}
+    /**
+     * 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%">' . "\n";
+        // get all enclosed answers
+        $blankList = array();
+        // build replacement
+        $replacementList = array();
+        foreach ($this->answer as $i => $answer) {
+            $blankList[] = '['.$answer.']';
+        }
+        $answerCount = count($blankList);
+
+        // splits text and weightings that are joined with the character '::'
+        list($answer,$weight)=explode('::',$answer);
+        $weights = explode(',',$weight);
+        // because [] is parsed here we follow this procedure:
+        // 1. find everything between the [ and ] tags
+        $i=1;
+        $jstmp = '';
+        $jstmpc = '';
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $startlocations=api_strpos($answer,'[');
+        $endlocations=api_strpos($answer,']');
+        while($startlocations !== false && $endlocations !== false) {
+            $texstring = api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
+            $answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+            $jstmp .= $i.',';
+            $jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
+            $my_weight=explode('@',$weights[$i-1]);
+            if (count($my_weight)==2) {
+                $weight_db=$my_weight[0];
+            } else {
+                $weight_db=$my_weight[0];
+            }
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $startlocations = api_strpos($answer, '[');
+            $endlocations = api_strpos($answer, ']');
+        }
+
+        $html .= 	'<tr>' . "\n"
+            .	'<td>' . "\n"
+            .	$answer  . "\n"
+            .	'</td>' . "\n"
+            .	'</tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
+        $js .= $jstmpw;
+
+        return array($js,$html);
+    }
 }
 
 /**
@@ -415,99 +415,99 @@ 
  */
 class ScormAnswerMatching extends Answer
 {
-	/**
-	 * Export the question part as a matrix-choice, with only one possible answer per line.
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	function export()
-	{
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		// prepare list of right proposition to allow
-		// - easiest display
-		// - easiest randomisation if needed one day
-		// (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
-
-		// 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>'."\n";
-				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
-				// fills the list-box
-				foreach($Select as $key=>$val)
-				{
-					$s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
-				}  // end foreach()
-
-				$s.='</select>&nbsp;&nbsp;</td>'."\n";
-				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-				else $s.='&nbsp;';
-				$s.="</td>\n</tr>\n";
-
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
-
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
-				} else {
-					$weight=$my_weight[0];
-				}
-				$jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
-				$cpt2++;
-
-				// if the left side of the "matching" has been completely shown
-				if ($answerId == $nbrAnswers) {
-					// if there remain answers to be shown on the right side
-					while (isset($Select[$cpt2])) {
-						//$s.='<tr>'."\n";
-						//$s.='<td colspan="2">'."\n";
-						//$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
-						$s.='<tr>'."\n";
-						$s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
-						$s.='<td width="40%" valign="top">';
-						$s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.="</td>\n</tr>\n";
-						$cpt2++;
-					}	// end while()
-				}  // end if()
-			}
-		}
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-		$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
-		$js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
-		$js .= $jstmpw;
-		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
-
-		return array($js,$html);
-	}
+    /**
+     * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    function export()
+    {
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        // prepare list of right proposition to allow
+        // - easiest display
+        // - easiest randomisation if needed one day
+        // (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
+
+        // 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>'."\n";
+                $s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
+                $s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
+                $s.=' <option value="0">--</option>';
+                // fills the list-box
+                foreach($Select as $key=>$val)
+                {
+                    $s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
+                }  // end foreach()
+
+                $s.='</select>&nbsp;&nbsp;</td>'."\n";
+                $s.='<td width="40%" valign="top">';
+                if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                else $s.='&nbsp;';
+                $s.="</td>\n</tr>\n";
+
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+
+                $my_weight=explode('@',$weight);
+                if (count($my_weight)==2) {
+                    $weight=$my_weight[0];
+                } else {
+                    $weight=$my_weight[0];
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
+                $cpt2++;
+
+                // if the left side of the "matching" has been completely shown
+                if ($answerId == $nbrAnswers) {
+                    // if there remain answers to be shown on the right side
+                    while (isset($Select[$cpt2])) {
+                        //$s.='<tr>'."\n";
+                        //$s.='<td colspan="2">'."\n";
+                        //$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
+                        $s.='<tr>'."\n";
+                        $s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
+                        $s.='<td width="40%" valign="top">';
+                        $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                        $s.="</td>\n</tr>\n";
+                        $cpt2++;
+                    }	// end while()
+                }  // end if()
+            }
+        }
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
+        $js .= $jstmpw;
+        $html .= $s;
+        $html .= '</table></td></tr>' . "\n";
+
+        return array($js,$html);
+    }
 }
 
 /**
@@ -516,36 +516,36 @@ 
  */
 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()
-	{
-		//$qId = $this->questionJSId;
-		$js = '';
-		/*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    /**
+     * 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()
+    {
+        //$qId = $this->questionJSId;
+        $js = '';
+        /*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
         // some javascript must be added for that kind of questions
         $html .= '<tr><td>
                 <textarea name="question_'.$qId.'_free" id="question_'.$qId.'_free" rows="20" cols="100"></textarea>
                 </td>
                 </tr>';
         $html .= '</table></td></tr>';*/
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-		$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-		$js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-		$js .= $jstmpw;
-
-		return array($js,$html);
-	}
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+        $js .= $jstmpw;
+
+        return array($js,$html);
+    }
 }
 /**
  * This class handles the SCORM export of hotpot questions
@@ -553,64 +553,64 @@ 
  */
 class ScormAnswerHotspot extends Answer
 {
-	/**
-	 * Returns the javascript code that goes with HotSpot exercises
-	 * @return string	The JavaScript code
-	 */
-	function get_js_header()
-	{
-		if ($this->standalone) {
-			$header = '<script type="text/javascript" language="javascript">';
-			$header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
-			$header .= '</script>';
-			//because this header closes so many times the <script> tag, we have to reopen our own
-			$header .= '<script type="text/javascript" language="javascript">'."\n";
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-			$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-			$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-			$header .= $jstmpw;
-		} else {
-			$header = '';
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-			$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-			$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
-			$header .= $jstmpw;
-		}
-
-		return $header;
-	}
-	/**
-	 * 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%">' . "\n";
-		// 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
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script type="text/javascript" language="javascript">';
+            $header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
+            $header .= '</script>';
+            //because this header closes so many times the <script> tag, we have to reopen our own
+            $header .= '<script type="text/javascript" language="javascript">'."\n";
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+            $header .= $jstmpw;
+        } else {
+            $header = '';
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
+            $header .= $jstmpw;
+        }
+
+        return $header;
+    }
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = $this->get_js_header();
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        // some javascript must be added for that kind of questions
+        $html .= '';
+
+        // 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
             <tr>
                 <td>
                     <div id="hotspot-{$this->questionJSId}"></div>
@@ -630,12 +630,12 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></td></tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
 
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-		return array($js,$html);
-	}
+        // 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);
+    }
 }
 
 
@@ -651,119 +651,119 @@ 
  */
 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()
-	{
-		global $charset;
-		$head = "";
-		if( $this->standalone)
-		{
-			$head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n";
-			$head .= '<html>'."\n";
-		}
-		return $head;
-	}
-
-	/**
-	 * 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>'."\n";
-		}
-
-		return '';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	function css()
-	{
-		$css = '';
-		if ($this->standalone) {
-			$css = '<style type="text/css" media="screen, projection">'."\n";
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>'."\n";
-			$css .= '<style type="text/css" media="print">'."\n";
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>'."\n";
-		}
-		return $css;
-	}
-
-	/**
-	 * End document header
-	 */
-	function end_header()
-	{
-		if ($this->standalone) {
-			return '</head>'."\n";
-		}
-
-		return '';
-	}
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_js()
-	{
-		if ($this->standalone) {
-			return '<script type="text/javascript" language="javascript">'."\n";
-		}
-		return '';
-	}
-	/**
-	 * Common JS functions
-	 */
-	function common_js()
-	{
-		$js = file_get_contents('../lp/js/api_wrapper.js');
-		$js .= 'var questions = new Array();' . "\n";
-		$js .= 'var questions_answers = new Array();' . "\n";
-		$js .= 'var questions_answers_correct = new Array();' . "\n";
-		$js .= 'var questions_types = new Array();' . "\n";
-		$js .= "\n" .
-			'/**
+    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()
+    {
+        global $charset;
+        $head = "";
+        if( $this->standalone)
+        {
+            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n";
+            $head .= '<html>'."\n";
+        }
+        return $head;
+    }
+
+    /**
+     * 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>'."\n";
+        }
+
+        return '';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    function css()
+    {
+        $css = '';
+        if ($this->standalone) {
+            $css = '<style type="text/css" media="screen, projection">'."\n";
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>'."\n";
+            $css .= '<style type="text/css" media="print">'."\n";
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>'."\n";
+        }
+        return $css;
+    }
+
+    /**
+     * End document header
+     */
+    function end_header()
+    {
+        if ($this->standalone) {
+            return '</head>'."\n";
+        }
+
+        return '';
+    }
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_js()
+    {
+        if ($this->standalone) {
+            return '<script type="text/javascript" language="javascript">'."\n";
+        }
+        return '';
+    }
+    /**
+     * Common JS functions
+     */
+    function common_js()
+    {
+        $js = file_get_contents('../lp/js/api_wrapper.js');
+        $js .= 'var questions = new Array();' . "\n";
+        $js .= 'var questions_answers = new Array();' . "\n";
+        $js .= 'var questions_answers_correct = new Array();' . "\n";
+        $js .= 'var questions_types = new Array();' . "\n";
+        $js .= "\n" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -798,85 +798,85 @@ 
             	addEvent(window,\'unload\',unloadPage,false);
             }'."\n\n";
 
-		$js .= '';
-		//$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
-		//$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-		if($this->standalone){return $js. "\n";}
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
-	{
-		if($this->standalone){return '</script>'. "\n";}
-		return '';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		if ($this->standalone) {
-			return '<body>'."\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n";
-		}
-
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		if ($this->standalone) {
-			return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n";
-		}
-
-		return '';
-	}
-
-	/**
-	 * 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 A string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		$js = $html = '';
-		list($js,$html) = $this->question->export();
-		//list($js,$html) = $this->question->answer->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()
-				//         .$this->answer->imsExportResponsesDeclaration($this->questionIdent)
-				//         . $this->start_item_body()
-				//           . $this->answer->scormExportResponses($this->questionIdent, $this->question->question, $this->question->description, $this->question->picture)
-				//			.$question
-				. $html
-				. $this->end_body()
-				. $this->end_page();
-			return $res;
-		} else {
-			return array($js,$html);
-		}
-	}
+        $js .= '';
+        //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
+        //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        if($this->standalone){return $js. "\n";}
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
+        if($this->standalone){return '</script>'. "\n";}
+        return '';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        if ($this->standalone) {
+            return '<body>'."\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n";
+        }
+
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        if ($this->standalone) {
+            return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n";
+        }
+
+        return '';
+    }
+
+    /**
+     * 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 A string, the XML flow for an Item.
+     */
+    function export()
+    {
+        $js = $html = '';
+        list($js,$html) = $this->question->export();
+        //list($js,$html) = $this->question->answer->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()
+                //         .$this->answer->imsExportResponsesDeclaration($this->questionIdent)
+                //         . $this->start_item_body()
+                //           . $this->answer->scormExportResponses($this->questionIdent, $this->question->question, $this->question->description, $this->question->picture)
+                //			.$question
+                . $html
+                . $this->end_body()
+                . $this->end_page();
+            return $res;
+        } else {
+            return array($js,$html);
+        }
+    }
 }
 
 /**
@@ -893,118 +893,118 @@ 
  */
 class ScormSection
 {
-	public $exercise;
-	public $standalone;
-
-	/**
-	 * Send a complete exercise in SCORM format, from its ID
-	 *
-	 * @param int $exerciseId The exercise to exporte
-	 * @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($exerciseId, $standalone = true)
-	{
-		$exercise = new Exercise();
-		if (!$exercise->read($exerciseId)) {
-			return '';
-		}
-		$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>
-	 */
-	function ScormSection($exe)
-	{
-		$this->exercise = $exe;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
-		global $charset;
-		$head = $foot = "";
-		$head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n".'<html>'."\n";
-		return $head;
-	}
-
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
-	{
-		return '</html>';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		return '<head>'. "\n";
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	function css()
-	{
-		$css = '<style type="text/css" media="screen, projection">'."\n";
-		$css .= '/*<![CDATA[*/'."\n";
-		$css .= '/*]]>*/'."\n";
-		$css .= '</style>'."\n";
-		$css .= '<style type="text/css" media="print">'."\n";
-		$css .= '/*<![CDATA[*/'."\n";
-		$css .= '/*]]>*/'."\n";
-		$css .= '</style>'."\n";
-
-		return $css;
-	}
-
-	/**
-	 * End document header
-	 */
-	function end_header()
-	{
-		return '</head>'. "\n";
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_js()
-	{
-		return '<script type="text/javascript" language="javascript">'. "\n";
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	function common_js()
-	{
-		$js = "\n";
-		$js .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
-		$js .= file_get_contents('../lp/js/api_wrapper.js');
-		$js .= 'var questions = new Array();' . "\n";
-		$js .= 'var questions_answers = new Array();' . "\n";
-		$js .= 'var questions_answers_correct = new Array();' . "\n";
-		$js .= 'var questions_types = new Array();' . "\n";
-		$js .= "\n" .
-			'/**
+    public $exercise;
+    public $standalone;
+
+    /**
+     * Send a complete exercise in SCORM format, from its ID
+     *
+     * @param int $exerciseId The exercise to exporte
+     * @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($exerciseId, $standalone = true)
+    {
+        $exercise = new Exercise();
+        if (!$exercise->read($exerciseId)) {
+            return '';
+        }
+        $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>
+     */
+    function ScormSection($exe)
+    {
+        $this->exercise = $exe;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
+        global $charset;
+        $head = $foot = "";
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n".'<html>'."\n";
+        return $head;
+    }
+
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        return '</html>';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        return '<head>'. "\n";
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    function css()
+    {
+        $css = '<style type="text/css" media="screen, projection">'."\n";
+        $css .= '/*<![CDATA[*/'."\n";
+        $css .= '/*]]>*/'."\n";
+        $css .= '</style>'."\n";
+        $css .= '<style type="text/css" media="print">'."\n";
+        $css .= '/*<![CDATA[*/'."\n";
+        $css .= '/*]]>*/'."\n";
+        $css .= '</style>'."\n";
+
+        return $css;
+    }
+
+    /**
+     * End document header
+     */
+    function end_header()
+    {
+        return '</head>'. "\n";
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_js()
+    {
+        return '<script type="text/javascript" language="javascript">'. "\n";
+    }
+
+    /**
+     * Common JS functions
+     */
+    function common_js()
+    {
+        $js = "\n";
+        $js .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
+        $js .= file_get_contents('../lp/js/api_wrapper.js');
+        $js .= 'var questions = new Array();' . "\n";
+        $js .= 'var questions_answers = new Array();' . "\n";
+        $js .= 'var questions_answers_correct = new Array();' . "\n";
+        $js .= 'var questions_types = new Array();' . "\n";
+        $js .= "\n" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -1046,96 +1046,96 @@ 
             }
             '."\n";
 
-		$js .= '';
-		//$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
-		//$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-		return $js. "\n";
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js() {
-		return '</script>'. "\n";
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		return '<body>'. "\n".
-		'<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>\n".
-		'<form id="dokeos_scorm_form" method="post" action="">'."\n".
-		'<table width="100%">'."\n";
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";
-	}
-
-	/**
-	 * 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();
-		//list($js,$html) = $this->question->answer->export();
-		$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()
-			//         .$this->answer->imsExportResponsesDeclaration($this->questionIdent)
-			//         . $this->start_item_body()
-			//           . $this->answer->scormExportResponses($this->questionIdent, $this->question->question, $this->question->description, $this->question->picture)
-			//			.$question
-			.$html
-			. $this->end_body()
-			. $this->end_page();
-
-		return $res;
-	}
-
-	/**
-	 * 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);
-	}
+        $js .= '';
+        //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
+        //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        return $js. "\n";
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js() {
+        return '</script>'. "\n";
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        return '<body>'. "\n".
+        '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>\n".
+        '<form id="dokeos_scorm_form" method="post" action="">'."\n".
+        '<table width="100%">'."\n";
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";
+    }
+
+    /**
+     * 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();
+        //list($js,$html) = $this->question->answer->export();
+        $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()
+            //         .$this->answer->imsExportResponsesDeclaration($this->questionIdent)
+            //         . $this->start_item_body()
+            //           . $this->answer->scormExportResponses($this->questionIdent, $this->question->question, $this->question->description, $this->question->picture)
+            //			.$question
+            .$html
+            . $this->end_body()
+            . $this->end_page();
+
+        return $res;
+    }
+
+    /**
+     * 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/exercise/exercise_submit_modal.php

Indentation +142 added lines, -142 removed lines

@@ -43,13 +43,13 @@ 
 $learnpath_id = 0;
 
 if (isset($_REQUEST['learnpath_id'])) {
-	$learnpath_id = intval($_REQUEST['learnpath_id']);
+    $learnpath_id = intval($_REQUEST['learnpath_id']);
 }
 
 $learnpath_item_id = 0;
 
 if (isset($_REQUEST['learnpath_item_id'])) {
-	$learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
+    $learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
 }
 
 $_SESSION['hotspot_coord']=array();
@@ -93,7 +93,7 @@ 
 // Getting the options by js
 if (empty($choice_value)) {
 
-	echo "<script>
+    echo "<script>
 		// this works for only radio buttons
 		var f = self.parent.window.document.frm_exercise;
 		var choice_js='';
@@ -122,12 +122,12 @@ 
 		}
 
 	";
-	// IMPORTANT
-	//this is the real redirect function
-	//echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
+    // IMPORTANT
+    //this is the real redirect function
+    //echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo ' url = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo "$('#global-modal .modal-body').load(url);";
-	echo '</script>';
+    echo '</script>';
 
     exit;
 }
@@ -180,12 +180,12 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+    $objQuestionTmp 	= Question :: read($questionid);
+    $questionName		=$objQuestionTmp->selectTitle();
+    $questionDescription=$objQuestionTmp->selectDescription();
+    $questionWeighting	=$objQuestionTmp->selectWeighting();
+    $answerType			=$objQuestionTmp->selectType();
+    $quesId				=$objQuestionTmp->selectId(); //added by priya saini
 }
 
 $objAnswerTmp=new Answer($questionid);
@@ -208,43 +208,43 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-		$answer            = $objAnswerTmp->selectAnswer($answerId);
-		$answerComment     = $objAnswerTmp->selectComment($answerId);
-		$answerDestination = $objAnswerTmp->selectDestination($answerId);
-
-		$answerCorrect     = $objAnswerTmp->isCorrect($answerId);
-		$answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
-		$numAnswer         = $objAnswerTmp->selectAutoId($answerId);
-
-		//delineation
-		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+    for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+        $answer            = $objAnswerTmp->selectAnswer($answerId);
+        $answerComment     = $objAnswerTmp->selectComment($answerId);
+        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+        $answerCorrect     = $objAnswerTmp->isCorrect($answerId);
+        $answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
+        $numAnswer         = $objAnswerTmp->selectAutoId($answerId);
+
+        //delineation
+        $delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
+        $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
         if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
 
-		switch($answerType) {
-			// for unique answer
-			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
-				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
-				}
-				break;
-			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
-				if ($studentChoice) {
-					$newquestionList[]=$questionid;
-				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
-				}
-				break;
-		}
+        switch($answerType) {
+            // for unique answer
+            case UNIQUE_ANSWER :
+                $studentChoice = ($choice_value == $numAnswer)?1:0;
+                if ($studentChoice) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $newquestionList[]=$questionid;
+                }
+                break;
+            case HOT_SPOT_DELINEATION :
+                $studentChoice=$choice[$answerId];
+                if ($studentChoice) {
+                    $newquestionList[]=$questionid;
+                }
+                if ($answerId===1) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $_SESSION['hotspot_coord'][1]	=$delineation_cord;
+                    $_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+                }
+                break;
+        }
 
 
         if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
@@ -341,7 +341,7 @@ 
                         $lp_hotspot=$destination_items[2];
                         $select_question_hotspot=$destination_items[3];
                         $url_hotspot=$destination_items[4];
-                         //echo 'show the feedback';
+                            //echo 'show the feedback';
                     }
                 } elseif($answerId>1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
@@ -398,41 +398,41 @@ 
                 //we send the error
             }
         }
-	}
+    }
 
-	if ($overlap_color) {
-		$overlap_color='green';
+    if ($overlap_color) {
+        $overlap_color='green';
     } else {
-		$overlap_color='red';
+        $overlap_color='red';
     }
-	if ($missing_color) {
-		$missing_color='green';
+    if ($missing_color) {
+        $missing_color='green';
     } else {
-		$missing_color='red';
+        $missing_color='red';
     }
-	if ($excess_color) {
-		$excess_color='green';
+    if ($excess_color) {
+        $excess_color='green';
     } else {
-		$excess_color='red';
+        $excess_color='red';
     }
 
     if (!is_numeric($final_overlap)) {
-    	$final_overlap = 0;
+        $final_overlap = 0;
     }
 
     if (!is_numeric($final_missing)) {
-    	$final_missing = 0;
+        $final_missing = 0;
     }
     if (!is_numeric($final_excess)) {
-    	$final_excess = 0;
+        $final_excess = 0;
     }
 
     if ($final_excess>100) {
-    	$final_excess = 100;
+        $final_excess = 100;
     }
 
 
-	$table_resume = '<table class="data_table" >
+    $table_resume = '<table class="data_table" >
 	<tr class="row_odd" >
 		<td></td>
 		<td ><b>'.get_lang('Requirements').'</b></td>
@@ -457,7 +457,7 @@ 
 		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
-	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
+    //var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
@@ -474,68 +474,68 @@ 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
         $item_list = explode('@@',$destination);
-    	//print_R($item_list);
-    	$try = $item_list[0];
-    	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+        //print_R($item_list);
+        $try = $item_list[0];
+        $lp = $item_list[1];
+        $destinationid= $item_list[2];
+        $url=$item_list[3];
     }
-	$table_resume='';
+    $table_resume='';
 } else {
-		$try = $try_hotspot;
-		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
-		// no error = no oar and no wrong result for delineation
-		//show if no error
-		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
-
-		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
-		$exerciseResult[$questionid] = 1;
-	} else {
-		$exerciseResult[$questionid] = 0;
-	}
+        $try = $try_hotspot;
+        $lp = $lp_hotspot;
+        $destinationid= $select_question_hotspot;
+        $url=$url_hotspot;
+    if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+        // no error = no oar and no wrong result for delineation
+        //show if no error
+        //echo 'no error';
+        $comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+        $answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+
+        //we send the error
+        $destination_items= explode('@@', $answerDestination);
+        $try=$destination_items[1];
+        $lp=$destination_items[2];
+        $destinationid=$destination_items[3];
+        $url=$destination_items[4];
+        $exerciseResult[$questionid] = 1;
+    } else {
+        $exerciseResult[$questionid] = 0;
+    }
 }
 
 // the link to retry the question
 if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+    $num_value_array= (array_keys($questionList, $questionid));
+    $links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
-	$list = new LearnpathList(api_get_user_id());
-	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+    $lp_url= api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+    $list = new LearnpathList(api_get_user_id());
+    $flat_list = $list->get_flat_list();
+    $links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
 $links.='<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+    $links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
 if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+    $links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
-	// the link to other question
-	if (in_array($destinationid,$questionList)) {
-		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
-	}
+    // the link to other question
+    if (in_array($destinationid,$questionList)) {
+        $objQuestionTmp = Question :: read($destinationid);
+        $questionName=$objQuestionTmp->selectTitle();
+        $num_value_array= (array_keys($questionList, $destinationid));
+        $links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+    }
 }
 
 echo '<script>
@@ -552,43 +552,43 @@ 
 </script>';
 
 if ($links!='') {
-	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
+    /*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
-	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
-
-	if ($answerType == HOT_SPOT_DELINEATION) {
-		if ($organs_at_risk_hit > 0) {
-			//$message='<p>'.get_lang('YourDelineation').'</p>';
-			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
-			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
-		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
-		}
-		echo $message;
-	} else {
-		echo '<p>'.$comment.'</p>';
-	}
-	echo '<h3>'.$links.'</h3>';
-	echo '</div>';
-
-	$_SESSION['hot_spot_result']=$message;
-	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
-	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
-
-	//save this variables just in case the exercise loads an LP with other exercise
-	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
-	$_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
-	$_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
+    echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
+
+    if ($answerType == HOT_SPOT_DELINEATION) {
+        if ($organs_at_risk_hit > 0) {
+            //$message='<p>'.get_lang('YourDelineation').'</p>';
+            //$message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+            //if ($wrong_results) { }
+            $message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+            $message.='<p>'.$comment.'</p>';
+        } else {
+            $message='<p>'.get_lang('YourDelineation').'</p>';
+            $message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+            $message.='<p>'.$comment.'</p>';
+        }
+        echo $message;
+    } else {
+        echo '<p>'.$comment.'</p>';
+    }
+    echo '<h3>'.$links.'</h3>';
+    echo '</div>';
+
+    $_SESSION['hot_spot_result']=$message;
+    $_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
+    //reseting the exerciseResult variable
+    Session::write('exerciseResult',$exerciseResult);
+
+    //save this variables just in case the exercise loads an LP with other exercise
+    $_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
+    $_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
+    $_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
 } else {
-	$questionNum++;
-	echo '<script>
+    $questionNum++;
+    echo '<script>
 			self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
    			//self.parent.tb_remove();
  	 	</script>';