diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php
index 23248e0afe..131617c88e 100755
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
@@ -39,18 +39,18 @@ $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqu
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.corners.min.js" type="text/javascript"></script>';
 
 if (api_get_setting('show_glossary_in_extra_tools') == 'true') {
-	$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/glossary.js" type="text/javascript" language="javascript"></script>'; //Glossary
-	$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>'; 
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/glossary.js" type="text/javascript" language="javascript"></script>'; //Glossary
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>'; 
 }
 //This library is necessary for the time control feature
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.epiclock.min.js" type="text/javascript" language="javascript"></script>'; //jQuery
 
 if (!ereg("MSIE",$_SERVER["HTTP_USER_AGENT"])) {
-	$htmlHeadXtra[] = "<script type='text/javascript' language='javascript'>
-	$(document).ready( function(){
-		$('.rounded').corners();
-		$('.exercise_options').corners();
-	});</script>";	
+    $htmlHeadXtra[] = "<script type='text/javascript' language='javascript'>
+    $(document).ready( function(){
+        $('.rounded').corners();
+        $('.exercise_options').corners();
+    });</script>";	
 }
 /* ------------	ACCESS RIGHTS ------------ */
 // notice for unauthorized people.
@@ -72,110 +72,110 @@ $TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
 // general parameters passed via POST/GET
 
 if (empty ($origin)) {
-	$origin = $_REQUEST['origin'];
+    $origin = $_REQUEST['origin'];
 }
 if (empty ($learnpath_id)) {
-	$learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']);
+    $learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']);
 }
 if (empty ($learnpath_item_id)) {
-	$learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
+    $learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
 }
 if (empty ($formSent)) {
-	$formSent = $_REQUEST['formSent'];
+    $formSent = $_REQUEST['formSent'];
 }
 if (empty ($exerciseResult)) {
-	$exerciseResult = $_REQUEST['exerciseResult'];
+    $exerciseResult = $_REQUEST['exerciseResult'];
 }
 if (empty ($exerciseResultCoordinates)) {
-	$exerciseResultCoordinates = $_REQUEST['exerciseResultCoordinates'];
+    $exerciseResultCoordinates = $_REQUEST['exerciseResultCoordinates'];
 }
 if (empty ($exerciseType)) {
-	$exerciseType = $_REQUEST['exerciseType'];
+    $exerciseType = $_REQUEST['exerciseType'];
 }
 if (empty ($exerciseId)) {
-  	$exerciseId = Database::escape_string(intval($_REQUEST['exerciseId']));	
+    $exerciseId = Database::escape_string(intval($_REQUEST['exerciseId']));	
 }
 if (empty ($choice)) {
-	$choice = $_REQUEST['choice'];
+    $choice = $_REQUEST['choice'];
 }
 if (empty ($_REQUEST['choice'])) {
-	$choice = $_REQUEST['choice2'];
+    $choice = $_REQUEST['choice2'];
 }
 if (empty ($questionNum)) {
-	$questionNum = Database :: escape_string($_REQUEST['questionNum']);
+    $questionNum = Database :: escape_string($_REQUEST['questionNum']);
 }
 if (empty ($nbrQuestions)) {
-	$nbrQuestions = Database :: escape_string($_REQUEST['nbrQuestions']);
+    $nbrQuestions = Database :: escape_string($_REQUEST['nbrQuestions']);
 }
 if (empty ($buttonCancel)) {
-	$buttonCancel = $_REQUEST['buttonCancel'];
+    $buttonCancel = $_REQUEST['buttonCancel'];
 }
 $error = '';
 if (!isset ($exerciseType)) {
-	$exe_start_date = time();
-	$_SESSION['exercice_start_date'] = $exe_start_date;
+    $exe_start_date = time();
+    $_SESSION['exercice_start_date'] = $exe_start_date;
 }
 // if the user has clicked on the "Cancel" button
 if ($buttonCancel) {
-	// returns to the exercise list
-	header("Location: exercice.php?origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
-	exit ();
+    // returns to the exercise list
+    header("Location: exercice.php?origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
+    exit ();
 }
 
 if ($origin == 'learnpath' && isset ($_GET['not_multiple_attempt']) && $_GET['not_multiple_attempt'] == strval(intval($_GET['not_multiple_attempt']))) {
-	$not_multiple_attempt = (int) $_GET['not_multiple_attempt'];
-	if ($not_multiple_attempt === 1) {
-		require_once '../inc/reduced_header.inc.php';
-		echo '<div style="height:10px">&nbsp;</div>';
-		Display :: display_warning_message(get_lang('ReachedOneAttempt'));
-		exit;
-	}
+    $not_multiple_attempt = (int) $_GET['not_multiple_attempt'];
+    if ($not_multiple_attempt === 1) {
+        require_once '../inc/reduced_header.inc.php';
+        echo '<div style="height:10px">&nbsp;</div>';
+        Display :: display_warning_message(get_lang('ReachedOneAttempt'));
+        exit;
+    }
 }
 
 if ($origin == 'builder') {
-	/*******************************/
-	/* Clears the exercise session */
-	/*******************************/
-	if (isset ($_SESSION['objExercise'])) {
-		api_session_unregister('objExercise');
-		unset ($objExercise);
-	}
-	if (isset ($_SESSION['objQuestion'])) {
-		api_session_unregister('objQuestion');
-		unset ($objQuestion);
-	}
-	if (isset ($_SESSION['objAnswer'])) {
-		api_session_unregister('objAnswer');
-		unset ($objAnswer);
-	}
-	if (isset ($_SESSION['questionList'])) {
-		api_session_unregister('questionList');
-		unset ($questionList);
-	}
-	if (isset ($_SESSION['newquestionList'])) {
-		api_session_unregister('newquestionList');
-		unset ($newquestionList);
-	}
-	if (isset ($_SESSION['exerciseResult'])) {
-		api_session_unregister('exerciseResult');
-		unset ($exerciseResult);
-	}
-	if (isset ($_SESSION['exerciseResultCoordinates'])) {
-		api_session_unregister('exerciseResultCoordinates');
-		unset ($exerciseResultCoordinates);
-	}
+    /*******************************/
+    /* Clears the exercise session */
+    /*******************************/
+    if (isset ($_SESSION['objExercise'])) {
+        api_session_unregister('objExercise');
+        unset ($objExercise);
+    }
+    if (isset ($_SESSION['objQuestion'])) {
+        api_session_unregister('objQuestion');
+        unset ($objQuestion);
+    }
+    if (isset ($_SESSION['objAnswer'])) {
+        api_session_unregister('objAnswer');
+        unset ($objAnswer);
+    }
+    if (isset ($_SESSION['questionList'])) {
+        api_session_unregister('questionList');
+        unset ($questionList);
+    }
+    if (isset ($_SESSION['newquestionList'])) {
+        api_session_unregister('newquestionList');
+        unset ($newquestionList);
+    }
+    if (isset ($_SESSION['exerciseResult'])) {
+        api_session_unregister('exerciseResult');
+        unset ($exerciseResult);
+    }
+    if (isset ($_SESSION['exerciseResultCoordinates'])) {
+        api_session_unregister('exerciseResultCoordinates');
+        unset ($exerciseResultCoordinates);
+    }
 }
 
 $safe_lp_id = ($learnpath_id == '') ? 0 : (int) $learnpath_id;
 $safe_lp_item_id = ($learnpath_item_id == '') ? 0 : (int) $learnpath_item_id;
 $condition = ' WHERE ' .
-	'exe_exo_id = ' . "'" . $exerciseId . "'" . ' AND ' .
-	'exe_user_id = ' . "'" . api_get_user_id() . "'" . ' AND ' .
-	'exe_cours_id = ' . "'" . $_course['id'] . "'" . ' AND ' .
-	'status = ' . "'incomplete'" . ' AND ' .
-	'orig_lp_id = ' . "'" . $safe_lp_id . "'" . ' AND ' .
-	'orig_lp_item_id = ' . "'" . $safe_lp_item_id . "'" . ' AND ' .
-	'session_id = ' . "'" . (int) $_SESSION['id_session'] . "'";
+    'exe_exo_id = ' . "'" . $exerciseId . "'" . ' AND ' .
+    'exe_user_id = ' . "'" . api_get_user_id() . "'" . ' AND ' .
+    'exe_cours_id = ' . "'" . $_course['id'] . "'" . ' AND ' .
+    'status = ' . "'incomplete'" . ' AND ' .
+    'orig_lp_id = ' . "'" . $safe_lp_id . "'" . ' AND ' .
+    'orig_lp_item_id = ' . "'" . $safe_lp_item_id . "'" . ' AND ' .
+    'session_id = ' . "'" . (int) $_SESSION['id_session'] . "'";
 
 $TBL_EXERCICES = Database :: get_course_table(TABLE_QUIZ_TEST);
 $sql_track_exercice = "SELECT type,feedback_type,expired_time FROM $TBL_EXERCICES WHERE id=$exerciseId";
@@ -184,6 +184,12 @@ $exercise_row = Database :: fetch_array($result);
 $exerciseType = $exercise_row['type'];
 $exerciseFeedbackType = $exercise_row['feedback_type'];
 
+/*
+ * Time control feature
+ * if the expired time is major that zero(0) then
+ * the expired time is compute on this time
+ */
+ 
 //Get the expired time of the current exercice in track_e_exercices
 $total_minutes = $exercise_row["expired_time"];
 
@@ -191,64 +197,74 @@ $total_seconds = $total_minutes*60;
 $current_timestamp = time();
 
 if ($exercise_row['expired_time'] != 0) {
-	if (!isset($_SESSION['expired_time'])) {
-		//In case that the current session php is broken
-		//Timer - Get expired_time for a student
-		$condition = ' WHERE ' .
-		'exe_exo_id =   '."'".Database::escape_string($exerciseId)."'".' AND ' .
-		'exe_user_id =  '."'".api_get_user_id()."'".' AND ' .
-		'exe_cours_id = '."'".api_get_course_id()."'".' AND ' .
-		'status = '."'incomplete'".' AND '.
-		'session_id = '."'".api_get_session_id()."'";
-		
-		$sql_track = 'SELECT exe_id,expired_time_control FROM '.$stat_table.$condition;
-		$rs_sql = Database::query($sql_track,__FILE__,__LINE__);
-		$exists_into_database = Database::num_rows($rs_sql);
-		$track_exercice_row = Database::fetch_array($rs_sql);
-		$expired_time_of_this_attempt = $track_exercice_row['expired_time_control'];
-		
-		//Get the last attempt of an exercice
-		$sql_track_attempt = 'SELECT max(tms) as last_attempt_date FROM '.$exercice_attemp_table.' WHERE exe_id="'.$track_exercice_row['exe_id'].'"';
-		$rs_last_attempt = Database::query($sql_track_attempt,__FILE__,__LINE__);
-		$row_last_attempt = Database::fetch_array($rs_last_attempt);
-		$my_last_attempt_date = $row_last_attempt['last_attempt_date'];
-		
-		//change the date format
-		$my_last_attempt_date = strtotime($my_last_attempt_date);
-		$expired_time_of_this_attempt = strtotime($expired_time_of_this_attempt);
-	
-		//New expired time
-		$new_expired_time_in_seconds = $expired_time_of_this_attempt - $my_last_attempt_date;
-		
-		if ($exists_into_database == 1) {
-		    $expected_time = $current_timestamp + $new_expired_time_in_seconds;
-	
-			$plugin_expired_time = date('M d, Y H:i:s',$expected_time);
-			$clock_expired_time = date('Y-m-d H:i:s',$expected_time);
-
-			//We modify the "expired_time_control" field in track_e_exercices for this attempt
-		 	$sql_track_e_exe = "UPDATE $stat_table SET expired_time_control = '".$clock_expired_time."' WHERE exe_id = '".$track_exercice_row['exe_id']."'";
-		 	Database::query($sql_track_e_exe,__FILE__,__LINE__);
+    if (!isset($_SESSION['expired_time'])) {
+        //In case that the current session php is broken
+        //Timer - Get expired_time for a student
+        $condition = ' WHERE ' .
+        'exe_exo_id =   '."'".Database::escape_string($exerciseId)."'".' AND ' .
+        'exe_user_id =  '."'".api_get_user_id()."'".' AND ' .
+        'exe_cours_id = '."'".api_get_course_id()."'".' AND ' .
+        'status = '."'incomplete'".' AND '.
+        'session_id = '."'".api_get_session_id()."'";
+        
+        $sql_track = 'SELECT exe_id,expired_time_control FROM '.$stat_table.$condition;
+        $rs_sql = Database::query($sql_track,__FILE__,__LINE__);
+        $exists_into_database = Database::num_rows($rs_sql);
+        $track_exercice_row = Database::fetch_array($rs_sql);
+        $expired_time_of_this_attempt = $track_exercice_row['expired_time_control'];
+        
+        //Get the last attempt of an exercice
+        $sql_track_attempt = 'SELECT max(tms) as last_attempt_date FROM '.$exercice_attemp_table.' WHERE exe_id="'.$track_exercice_row['exe_id'].'"';
+        $rs_last_attempt = Database::query($sql_track_attempt,__FILE__,__LINE__);
+        $row_last_attempt = Database::fetch_array($rs_last_attempt);
+        $my_last_attempt_date = $row_last_attempt['last_attempt_date'];//Get the date of last attempt
+        $date_of_last_attempt = $my_last_attempt_date;// Necessary for to change the last attempt
+        
+        //change the date format
+        $my_last_attempt_date = strtotime($my_last_attempt_date);
+        $expired_time_of_this_attempt = strtotime($expired_time_of_this_attempt);
+    
+        //New expired time - it is due to the possible closure of session
+        $new_expired_time_in_seconds = $expired_time_of_this_attempt - $my_last_attempt_date;
+
+        if ($exists_into_database == 1) {
+            $expected_time       = $current_timestamp + $new_expired_time_in_seconds;
             
+            $plugin_expired_time = date('M d, Y H:i:s', $expected_time);
+            $clock_expired_time  = date('Y-m-d H:i:s' , $expected_time);
+            $new_last_attempt    = date('Y-m-d H:i:s' , $current_timestamp);
+
+            //We modify the "expired_time_control" field in track_e_exercices for this attempt
+            $sql_track_e_exe = "UPDATE $stat_table SET expired_time_control = '".$clock_expired_time."' WHERE exe_id = '".$track_exercice_row['exe_id']."'";
+            Database::query($sql_track_e_exe,__FILE__,__LINE__);
+
+            // How the expired time is changed into "track_e_exercices" table,then the last attempt for this student should be changed too,so
+            $sql_track_e_exe = "UPDATE $exercice_attemp_table SET tms = '".$new_last_attempt."' WHERE exe_id = '".$track_exercice_row['exe_id']."' and tms = '".$date_of_last_attempt."' ";
+            Database::query($sql_track_e_exe,__FILE__,__LINE__);
+
             //Sessions  that contain the expired time				
-		 	$_SESSION['expired_time'] = $clock_expired_time;
-	     	$_SESSION['end_expired_time'] = date('M d, Y H:i:s',$expected_time);		
-		} else {
-			$expected_time = $current_timestamp + $total_seconds;
-			
-			$plugin_expired_time = date('M d, Y H:i:s',$expected_time);
-			$clock_expired_time = date('Y-m-d H:i:s',$expected_time);
+            $_SESSION['expired_time'] = $clock_expired_time;
+            $_SESSION['end_expired_time'] = date('M d, Y H:i:s',$expected_time);		
+        } else {
+            $expected_time = $current_timestamp + $total_seconds;
+            
+            $plugin_expired_time = date('M d, Y H:i:s',$expected_time);
+            $clock_expired_time = date('Y-m-d H:i:s',$expected_time);
 
             //Sessions  that contain the expired time	
-		 	$_SESSION['expired_time'] = $clock_expired_time;
-	     	$_SESSION['end_expired_time'] = date('M d, Y H:i:s',$expected_time);		
-		}
-	
-	} else {
-	  	$plugin_expired_time = $_SESSION['end_expired_time'];
-	}
+            $_SESSION['expired_time'] = $clock_expired_time;
+            $_SESSION['end_expired_time'] = date('M d, Y H:i:s',$expected_time);		
+        }
+    
+    } else {
+        $plugin_expired_time = $_SESSION['end_expired_time'];
+    }
 }
 
+/*
+ * The time control feature is enable here - this feature is enable for a jquery plugin called epiclock
+ * for more details of how it works see this link : http://eric.garside.name/docs.html?p=epiclock
+ */
 if ($exercise_row['expired_time'] != 0) { //Sends the exercice form when the expired time is finished 
     $htmlHeadXtra[] = "<script type=\"text/javascript\">
     $(document).ready(function(){    
@@ -257,12 +273,9 @@ if ($exercise_row['expired_time'] != 0) { //Sends the exercice form when the exp
          format: 'x{ : } i{ : } s{}',
          target: '".$plugin_expired_time."',
          onTimer: function(){ $('form#my_frm_exercise').submit() }
-       }).clocks(EC_RUN);
-         
-       $('.rounded').corners('transparent');
-         
+       }).clocks(EC_RUN);  
+       $('.rounded').corners('transparent');  
        $('#submit_save').click(function () { 
-      
       });  
            
     });
@@ -270,489 +283,489 @@ if ($exercise_row['expired_time'] != 0) { //Sends the exercice form when the exp
 }
 
 if ($_configuration['live_exercise_tracking'] == true && $exerciseType == ONE_PER_PAGE && $exerciseFeedbackType != EXERCISE_FEEDBACK_TYPE_DIRECT) {
-	$query = 'SELECT * FROM ' . $stat_table . $condition;
-	$result_select = Database::query($query, __FILE__, __LINE__);
-	if (Database :: num_rows($result_select) > 0) {
-		$getIncomplete = Database :: fetch_array($result_select);
-		$exe_id = $getIncomplete['exe_id'];
-		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-			define('QUESTION_LIST_ALREADY_LOGGED', 1);
-			$recorded['questionList'] = explode(',', $getIncomplete['data_tracking']);
-			$query = 'SELECT * FROM ' . $exercice_attemp_table . ' WHERE exe_id = ' . $getIncomplete['exe_id'] . ' ORDER BY tms ASC';
-			$result = Database::query($query, __FILE__, __LINE__);
-			while ($row = Database :: fetch_array($result)) {
-				$recorded['exerciseResult'][$row['question_id']] = 1;
-			}
-			$exerciseResult = $_SESSION['exerciseResult'] = $recorded['exerciseResult'];
-			$exerciseType = ONE_PER_PAGE;
-			$questionNum = count($recorded['exerciseResult']);
-			$questionNum++;
-			$questionList = $_SESSION['questionList'] = $recorded['questionList'];
-		}
-	} else {
-		$table_recorded_not_exist = true;
-	}
+    $query = 'SELECT * FROM ' . $stat_table . $condition;
+    $result_select = Database::query($query, __FILE__, __LINE__);
+    if (Database :: num_rows($result_select) > 0) {
+        $getIncomplete = Database :: fetch_array($result_select);
+        $exe_id = $getIncomplete['exe_id'];
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            define('QUESTION_LIST_ALREADY_LOGGED', 1);
+            $recorded['questionList'] = explode(',', $getIncomplete['data_tracking']);
+            $query = 'SELECT * FROM ' . $exercice_attemp_table . ' WHERE exe_id = ' . $getIncomplete['exe_id'] . ' ORDER BY tms ASC';
+            $result = Database::query($query, __FILE__, __LINE__);
+            while ($row = Database :: fetch_array($result)) {
+                $recorded['exerciseResult'][$row['question_id']] = 1;
+            }
+            $exerciseResult = $_SESSION['exerciseResult'] = $recorded['exerciseResult'];
+            $exerciseType = ONE_PER_PAGE;
+            $questionNum = count($recorded['exerciseResult']);
+            $questionNum++;
+            $questionList = $_SESSION['questionList'] = $recorded['questionList'];
+        }
+    } else {
+        $table_recorded_not_exist = true;
+    }
 }
 
 // if the user has submitted the form
 
 if ($formSent) {
-	if ($debug > 0) {
-		echo str_repeat('&nbsp;', 0) . '$formSent was set' . "<br />\n";
-	}
+    if ($debug > 0) {
+        echo str_repeat('&nbsp;', 0) . '$formSent was set' . "<br />\n";
+    }
 
-	// initializing
-	if (!is_array($exerciseResult)) {
-		$exerciseResult = array ();
-		$exerciseResultCoordinates = array ();
-	}
+    // initializing
+    if (!is_array($exerciseResult)) {
+        $exerciseResult = array ();
+        $exerciseResultCoordinates = array ();
+    }
 
     //Only for hotspot
-	if (!isset($choice) && isset($_REQUEST['hidden_hotspot_id'])) {
-		$hotspot_id = (int)($_REQUEST['hidden_hotspot_id']);
-		$choice = array($hotspot_id => '');
-	}
-
-	// if the user has answered at least one question
-	if (is_array($choice)) {
-		if ($debug > 0) {
-			echo str_repeat('&nbsp;', 0) . '$choice is an array' . "<br />\n";
-		}
-
-		if ($exerciseType == ALL_ON_ONE_PAGE) {
-			// $exerciseResult receives the content of the form.
-			// Each choice of the student is stored into the array $choice
-			$exerciseResult = $choice;
-
-			// Also store hotspot spots in the session ($exerciseResultCoordinates
-			// will be stored in the session at the end of this script)
-			// The results will be stored by exercise_result.php if we are in
-			// an exercise of type 1 (=all on one page)
-			if (isset ($_POST['hotspot'])) {
-				$exerciseResultCoordinates = $_POST['hotspot'];
-			}
-
-		} else {
-			// gets the question ID from $choice. It is the key of the array
-			list ($key) = array_keys($choice);
-			// if the user didn't already answer this question
-			if (!isset ($exerciseResult[$key])) {
-				// stores the user answer into the array
-				$exerciseResult[$key] = $choice[$key];
-
-				//saving each question
-				if ($_configuration['live_exercise_tracking'] == true && $exerciseType == ONE_PER_PAGE && $exerciseFeedbackType != EXERCISE_FEEDBACK_TYPE_DIRECT) {
-
-					$nro_question = $questionNum; // - 1;
-
-					//START of saving and qualifying each question submitted
-					//------------------------------------------------------------------------------------------
-					//
-					define('ENABLED_LIVE_EXERCISE_TRACKING', 1);
-					require_once 'question.class.php';
-					require_once 'answer.class.php';
-
-					$counter = 0;
-					$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-					$table_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER);
-					
-					//foreach($questionList as $questionId)
-					if (true) {
-						$exeId = $exe_id;
-						$questionId = $key;
-						$counter++;
-						// gets the student choice for this question
-						$choice = $exerciseResult[$questionId];
-						// creates a temporary Question object
-						$objQuestionTmp = Question :: read($questionId);
-
-						$questionName = $objQuestionTmp->selectTitle();
-						$questionDescription = $objQuestionTmp->selectDescription();
-						$questionWeighting = $objQuestionTmp->selectWeighting();
-						$answerType = $objQuestionTmp->selectType();
-						$quesId = $objQuestionTmp->selectId(); //added by priya saini
-
-						// destruction of the Question object
-						unset ($objQuestionTmp);
-
-						if (isset ($_POST['hotspot']) && isset($_POST['hotspot'][$key])) {
-							$exerciseResultCoordinates[$key] = $_POST['hotspot'][$key];
-						}
-
-						// construction of the Answer object
-						$objAnswerTmp = new Answer($questionId);
-						$nbrAnswers = $objAnswerTmp->selectNbrAnswers();
-						$questionScore = 0;
-						if ($answerType == FREE_ANSWER) {
-							$nbrAnswers = 1;
-						}
-						$real_answers = array();
-						for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
-							$answer = $objAnswerTmp->selectAnswer($answerId);
-							$answerComment = $objAnswerTmp->selectComment($answerId);
-							$answerCorrect = $objAnswerTmp->isCorrect($answerId);
-							$answerWeighting = $objAnswerTmp->selectWeighting($answerId);
-							$numAnswer=$objAnswerTmp->selectAutoId($answerId);
-							switch ($answerType) {
-								// for unique answer
-								case UNIQUE_ANSWER :
-									$studentChoice=($choice == $numAnswer)?1:0;
-									if ($studentChoice) {
-									  	$questionScore+=$answerWeighting;
-										$totalScore+=$answerWeighting;
-									}
-									break;
-									// for multiple answers
-								case MULTIPLE_ANSWER :
-									$studentChoice=$choice[$numAnswer];													
-									if ($studentChoice) {
-										$questionScore+=$answerWeighting;
-										$totalScore+=$answerWeighting;
-									}																		
-									break;
-								case MULTIPLE_ANSWER_COMBINATION:
-									$studentChoice=$choice[$numAnswer];									
-																			
-									if ($answerCorrect == 1) {
-										if ($studentChoice) {
-											$real_answers[$answerId] = true;
-										} else {
-											$real_answers[$answerId] = false;
-										}
-									} else {
-										if ($studentChoice) {
-											$real_answers[$answerId] = false;
-										} else {
-											$real_answers[$answerId] = true;
-										}
-									}
-										
-									$final_answer = true;
-								 	foreach($real_answers as $my_answer) {
-								 		if (!$my_answer) {
-								 			$final_answer = false;
-								 		}		 		
-								 	}																
-									break;
-									// for fill in the blanks
-								case FILL_IN_BLANKS :
-
-									// the question is encoded like this
-									// [A] B [C] D [E] F::10,10,10@1
-									// number 1 before the "@" means that is a switchable fill in blank question
-									// [A] B [C] D [E] F::10,10,10@ or  [A] B [C] D [E] F::10,10,10
-									// means that is a normal fill blank question
-
-									// first we explode the "::"
-									$pre_array = explode('::', $answer);
-
-									// is switchable fill blank or not
-									$last = count($pre_array) - 1;
-									$is_set_switchable = explode('@', $pre_array[$last]);
-
-									$switchable_answer_set = false;
-									if (isset ($is_set_switchable[1]) && $is_set_switchable[1] == 1) {
-										$switchable_answer_set = true;
-									}
-
-									$answer = '';
-									for ($k = 0; $k < $last; $k++) {
-										$answer .= $pre_array[$k];
-									}
-
-									// splits weightings that are joined with a comma
-									$answerWeighting = explode(',', $is_set_switchable[0]);
-
-									// we save the answer because it will be modified
-									$temp = $answer;
-
-									// TeX parsing
-									// 1. find everything between the [tex] and [/tex] tags
-									$startlocations = strpos($temp, '[tex]');
-									$endlocations = strpos($temp, '[/tex]');
-
-									if ($startlocations !== false && $endlocations !== false) {
-										$texstring = substr($temp, $startlocations, $endlocations - $startlocations +6);
-										// 2. replace this by {texcode}
-										$temp = str_replace($texstring, '{texcode}', $temp);
-									}
-
-									$answer = '';
-									$j = 0;
-
-									//initialise answer tags
-									$user_tags = array ();
-									$correct_tags = array ();
-									$real_text = array ();
-									// the loop will stop at the end of the text
-									while (1) {
-										// quits the loop if there are no more blanks (detect '[')
-										if (($pos = strpos($temp, '[')) === false) {
-											// adds the end of the text
-											$answer = $temp;
-											// TeX parsing - replacement of texcode tags
-											$texstring = api_parse_tex($texstring);
-											$answer = str_replace("{texcode}", $texstring, $answer);
-											$real_text[] = $answer;
-											break; //no more "blanks", quit the loop
-										}
-										// adds the piece of text that is before the blank
-										//and ends with '[' into a general storage array
-										$real_text[] = substr($temp, 0, $pos +1);
-										$answer .= substr($temp, 0, $pos +1);
-										//take the string remaining (after the last "[" we found)
-										$temp = substr($temp, $pos +1);
-										// quit the loop if there are no more blanks, and update $pos to the position of next ']'
-										if (($pos = strpos($temp, ']')) === false) {
-											// adds the end of the text
-											$answer .= $temp;
-											break;
-										}
-										$choice[$j] = trim($choice[$j]);
-										$user_tags[] = strtolower($choice[$j]);
-										//put the contents of the [] answer tag into correct_tags[]
-										$correct_tags[] = strtolower(substr($temp, 0, $pos));
-										$j++;
-										$temp = substr($temp, $pos +1);
-										//$answer .= ']';
-									}
-
-									$answer = '';
-									$real_correct_tags = $correct_tags;
-									$chosen_list = array ();
-
-									for ($i = 0; $i < count($real_correct_tags); $i++) {
-										if ($i == 0) {
-											$answer .= $real_text[0];
-										}
-
-										if (!$switchable_answer_set) {
-											if ($correct_tags[$i] == $user_tags[$i]) {
-												// gives the related weighting to the student
-												$questionScore += $answerWeighting[$i];
-												// increments total score
-												$totalScore += $answerWeighting[$i];
-												// adds the word in green at the end of the string
-												$answer .= $correct_tags[$i];
-											}
-											// else if the word entered by the student IS NOT the same as the one defined by the professor
-											elseif (!empty ($user_tags[$i])) {
-												// adds the word in red at the end of the string, and strikes it
-												$answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
-											} else {
-												// adds a tabulation if no word has been typed by the student
-												$answer .= '&nbsp;&nbsp;&nbsp;';
-											}
-										} else {
-											// switchable fill in the blanks
-											if (in_array($user_tags[$i], $correct_tags)) {
-												$chosen_list[] = $user_tags[$i];
-												$correct_tags = array_diff($correct_tags, $chosen_list);
-
-												// gives the related weighting to the student
-												$questionScore += $answerWeighting[$i];
-												// increments total score
-												$totalScore += $answerWeighting[$i];
-												// adds the word in green at the end of the string
-												$answer .= $user_tags[$i];
-											}
-											elseif (!empty ($user_tags[$i])) {
-												// else if the word entered by the student IS NOT the same as the one defined by the professor
-												// adds the word in red at the end of the string, and strikes it
-												$answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
-											} else {
-												// adds a tabulation if no word has been typed by the student
-												$answer .= '&nbsp;&nbsp;&nbsp;';
-											}
-										}
-										// adds the correct word, followed by ] to close the blank
-										$answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
-										if (isset ($real_text[$i +1])) {
-											$answer .= $real_text[$i +1];
-										}
-									}
-
-									break;
-									// for free answer
-								case FREE_ANSWER :
-									$studentChoice = $choice;
-
-									if ($studentChoice) {
-										//Score is at -1 because the question has'nt been corected
-										$questionScore = -1;
-										$totalScore += 0;
-									}
-									break;
-									// for matching
-								case MATCHING :
-
-									$numAnswer=$objAnswerTmp->selectAutoId($answerId);
-									if ($answerCorrect) {										
-										if ($answerCorrect == $choice[$numAnswer]) {											
-											$questionScore+=$answerWeighting;
-											$totalScore+=$answerWeighting;
-										}
-										$matching[$numAnswer] =  $choice[$numAnswer];
-									}
-									break;
-									// for hotspot with no order
-								case HOT_SPOT :
-									$studentChoice = $choice[$answerId];
-									if ($studentChoice) {
-										$questionScore += $answerWeighting;
-										$totalScore += $answerWeighting;
-									}
-									break;
-									// for hotspot with fixed order
-								case HOT_SPOT_ORDER :
-									$studentChoice = $choice['order'][$answerId];
-
-									if ($studentChoice == $answerId) {
-										$questionScore += $answerWeighting;
-										$totalScore += $answerWeighting;
-										$studentChoice = true;
-									} else {
-										$studentChoice = false;
-									}
-									break;
-							} // end switch Answertype
-						} // end for that loops over all answers of the current question
-						// destruction of Answer
-						
-						//we add the total score after dealing with the answers
-						if ($answerType == MULTIPLE_ANSWER_COMBINATION) {
-				 			if ($final_answer) {
-					 			//getting only the first score where we save the weight of all the question 
-					 			$answerWeighting=$objAnswerTmp->selectWeighting(1);
-								$questionScore+=$answerWeighting;
-								$totalScore+=$answerWeighting;
-							}
-						}
-						
-						unset ($objAnswerTmp);
-
-						$i++;
-
-						$totalWeighting += $questionWeighting;
-						//added by priya saini
-						// Store results directly in the database
-						// For all in one page exercises, the results will be
-						// stored by exercise_results.php (using the session)
-						if ($_configuration['tracking_enabled']) {
-							if (empty ($choice)) {
-								$choice = 0;
-							}
-							if ($answerType == MULTIPLE_ANSWER) {
-								if ($choice != 0) {
-									$reply = array_keys($choice);
-									for ($i = 0; $i < sizeof($reply); $i++) {
-										$ans = $reply[$i];
-										exercise_attempt($questionScore, $ans, $quesId, $exeId, $i);
-									}
-								} else {
-									exercise_attempt($questionScore, 0, $quesId, $exeId, 0);
-								}
-							} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
-								if ($choice != 0) {
-									$reply = array_keys($choice);
-									for ($i = 0; $i < sizeof($reply); $i++) {
-										$ans = $reply[$i];
-										exercise_attempt($questionScore, $ans, $quesId, $exeId, $i);
-									}
-								} else {
-									exercise_attempt($questionScore, 0, $quesId, $exeId, 0);
-								}
-							} elseif ($answerType == MATCHING) {
-								foreach ($matching as $j => $val) {
-									exercise_attempt($questionScore, $val, $quesId, $exeId, $j);
-								}
-							} elseif ($answerType == FREE_ANSWER) {
-								$answer = $choice;
-								exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
-							} elseif ($answerType == UNIQUE_ANSWER) {
-								$answer = $choice;
-								exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
-							} elseif ($answerType == HOT_SPOT) {
-								exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
-								if (is_array($exerciseResultCoordinates[$key])) {
-									foreach($exerciseResultCoordinates[$key] as $idx => $val) {										
-										exercise_attempt_hotspot($exeId,$quesId,$idx,$choice[$idx],$val);
-									}
-								}
-							} else {
-								exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
-							}
-						}
-					}
-					// end huge foreach() block that loops over all questions
-					//at loops over all questions
-					if (isset($exe_id)) {						
-						$sql_update = 'UPDATE ' . $stat_table . ' SET exe_result = exe_result + ' . (int) $totalScore . ',exe_weighting = exe_weighting + ' . (int) $totalWeighting . ' WHERE exe_id = ' . Database::escape_string($exe_id);
-						Database::query($sql_update, __FILE__, __LINE__);
-					}
-
-					//END of saving and qualifying
-					//------------------------------------------------------------------------------------------
-					//
-				}
-			}
-		}
-		if ($debug > 0) {
-			echo str_repeat('&nbsp;', 0) . '$choice is an array - end' . "<br />\n";
-		}
-	}
-
-	// the script "exercise_result.php" will take the variable $exerciseResult from the session
-	api_session_register('exerciseResult');
-	api_session_register('exerciseResultCoordinates');
-	
-	// if all questions on one page OR if it is the last question (only for an exercise with one question per page)
+    if (!isset($choice) && isset($_REQUEST['hidden_hotspot_id'])) {
+        $hotspot_id = (int)($_REQUEST['hidden_hotspot_id']);
+        $choice = array($hotspot_id => '');
+    }
+
+    // if the user has answered at least one question
+    if (is_array($choice)) {
+        if ($debug > 0) {
+            echo str_repeat('&nbsp;', 0) . '$choice is an array' . "<br />\n";
+        }
+
+        if ($exerciseType == ALL_ON_ONE_PAGE) {
+            // $exerciseResult receives the content of the form.
+            // Each choice of the student is stored into the array $choice
+            $exerciseResult = $choice;
+
+            // Also store hotspot spots in the session ($exerciseResultCoordinates
+            // will be stored in the session at the end of this script)
+            // The results will be stored by exercise_result.php if we are in
+            // an exercise of type 1 (=all on one page)
+            if (isset ($_POST['hotspot'])) {
+                $exerciseResultCoordinates = $_POST['hotspot'];
+            }
+
+        } else {
+            // gets the question ID from $choice. It is the key of the array
+            list ($key) = array_keys($choice);
+            // if the user didn't already answer this question
+            if (!isset ($exerciseResult[$key])) {
+                // stores the user answer into the array
+                $exerciseResult[$key] = $choice[$key];
+
+                //saving each question
+                if ($_configuration['live_exercise_tracking'] == true && $exerciseType == ONE_PER_PAGE && $exerciseFeedbackType != EXERCISE_FEEDBACK_TYPE_DIRECT) {
+
+                    $nro_question = $questionNum; // - 1;
+
+                    //START of saving and qualifying each question submitted
+                    //------------------------------------------------------------------------------------------
+                    //
+                    define('ENABLED_LIVE_EXERCISE_TRACKING', 1);
+                    require_once 'question.class.php';
+                    require_once 'answer.class.php';
+
+                    $counter = 0;
+                    $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+                    $table_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+                    
+                    //foreach($questionList as $questionId)
+                    if (true) {
+                        $exeId = $exe_id;
+                        $questionId = $key;
+                        $counter++;
+                        // gets the student choice for this question
+                        $choice = $exerciseResult[$questionId];
+                        // creates a temporary Question object
+                        $objQuestionTmp = Question :: read($questionId);
+
+                        $questionName = $objQuestionTmp->selectTitle();
+                        $questionDescription = $objQuestionTmp->selectDescription();
+                        $questionWeighting = $objQuestionTmp->selectWeighting();
+                        $answerType = $objQuestionTmp->selectType();
+                        $quesId = $objQuestionTmp->selectId(); //added by priya saini
+
+                        // destruction of the Question object
+                        unset ($objQuestionTmp);
+
+                        if (isset ($_POST['hotspot']) && isset($_POST['hotspot'][$key])) {
+                            $exerciseResultCoordinates[$key] = $_POST['hotspot'][$key];
+                        }
+
+                        // construction of the Answer object
+                        $objAnswerTmp = new Answer($questionId);
+                        $nbrAnswers = $objAnswerTmp->selectNbrAnswers();
+                        $questionScore = 0;
+                        if ($answerType == FREE_ANSWER) {
+                            $nbrAnswers = 1;
+                        }
+                        $real_answers = array();
+                        for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
+                            $answer = $objAnswerTmp->selectAnswer($answerId);
+                            $answerComment = $objAnswerTmp->selectComment($answerId);
+                            $answerCorrect = $objAnswerTmp->isCorrect($answerId);
+                            $answerWeighting = $objAnswerTmp->selectWeighting($answerId);
+                            $numAnswer=$objAnswerTmp->selectAutoId($answerId);
+                            switch ($answerType) {
+                                // for unique answer
+                                case UNIQUE_ANSWER :
+                                    $studentChoice=($choice == $numAnswer)?1:0;
+                                    if ($studentChoice) {
+                                        $questionScore+=$answerWeighting;
+                                        $totalScore+=$answerWeighting;
+                                    }
+                                    break;
+                                    // for multiple answers
+                                case MULTIPLE_ANSWER :
+                                    $studentChoice=$choice[$numAnswer];													
+                                    if ($studentChoice) {
+                                        $questionScore+=$answerWeighting;
+                                        $totalScore+=$answerWeighting;
+                                    }																		
+                                    break;
+                                case MULTIPLE_ANSWER_COMBINATION:
+                                    $studentChoice=$choice[$numAnswer];									
+                                                                            
+                                    if ($answerCorrect == 1) {
+                                        if ($studentChoice) {
+                                            $real_answers[$answerId] = true;
+                                        } else {
+                                            $real_answers[$answerId] = false;
+                                        }
+                                    } else {
+                                        if ($studentChoice) {
+                                            $real_answers[$answerId] = false;
+                                        } else {
+                                            $real_answers[$answerId] = true;
+                                        }
+                                    }
+                                        
+                                    $final_answer = true;
+                                    foreach($real_answers as $my_answer) {
+                                        if (!$my_answer) {
+                                            $final_answer = false;
+                                        }		 		
+                                    }																
+                                    break;
+                                    // for fill in the blanks
+                                case FILL_IN_BLANKS :
+
+                                    // the question is encoded like this
+                                    // [A] B [C] D [E] F::10,10,10@1
+                                    // number 1 before the "@" means that is a switchable fill in blank question
+                                    // [A] B [C] D [E] F::10,10,10@ or  [A] B [C] D [E] F::10,10,10
+                                    // means that is a normal fill blank question
+
+                                    // first we explode the "::"
+                                    $pre_array = explode('::', $answer);
+
+                                    // is switchable fill blank or not
+                                    $last = count($pre_array) - 1;
+                                    $is_set_switchable = explode('@', $pre_array[$last]);
+
+                                    $switchable_answer_set = false;
+                                    if (isset ($is_set_switchable[1]) && $is_set_switchable[1] == 1) {
+                                        $switchable_answer_set = true;
+                                    }
+
+                                    $answer = '';
+                                    for ($k = 0; $k < $last; $k++) {
+                                        $answer .= $pre_array[$k];
+                                    }
+
+                                    // splits weightings that are joined with a comma
+                                    $answerWeighting = explode(',', $is_set_switchable[0]);
+
+                                    // we save the answer because it will be modified
+                                    $temp = $answer;
+
+                                    // TeX parsing
+                                    // 1. find everything between the [tex] and [/tex] tags
+                                    $startlocations = strpos($temp, '[tex]');
+                                    $endlocations = strpos($temp, '[/tex]');
+
+                                    if ($startlocations !== false && $endlocations !== false) {
+                                        $texstring = substr($temp, $startlocations, $endlocations - $startlocations +6);
+                                        // 2. replace this by {texcode}
+                                        $temp = str_replace($texstring, '{texcode}', $temp);
+                                    }
+
+                                    $answer = '';
+                                    $j = 0;
+
+                                    //initialise answer tags
+                                    $user_tags = array ();
+                                    $correct_tags = array ();
+                                    $real_text = array ();
+                                    // the loop will stop at the end of the text
+                                    while (1) {
+                                        // quits the loop if there are no more blanks (detect '[')
+                                        if (($pos = strpos($temp, '[')) === false) {
+                                            // adds the end of the text
+                                            $answer = $temp;
+                                            // TeX parsing - replacement of texcode tags
+                                            $texstring = api_parse_tex($texstring);
+                                            $answer = str_replace("{texcode}", $texstring, $answer);
+                                            $real_text[] = $answer;
+                                            break; //no more "blanks", quit the loop
+                                        }
+                                        // adds the piece of text that is before the blank
+                                        //and ends with '[' into a general storage array
+                                        $real_text[] = substr($temp, 0, $pos +1);
+                                        $answer .= substr($temp, 0, $pos +1);
+                                        //take the string remaining (after the last "[" we found)
+                                        $temp = substr($temp, $pos +1);
+                                        // quit the loop if there are no more blanks, and update $pos to the position of next ']'
+                                        if (($pos = strpos($temp, ']')) === false) {
+                                            // adds the end of the text
+                                            $answer .= $temp;
+                                            break;
+                                        }
+                                        $choice[$j] = trim($choice[$j]);
+                                        $user_tags[] = strtolower($choice[$j]);
+                                        //put the contents of the [] answer tag into correct_tags[]
+                                        $correct_tags[] = strtolower(substr($temp, 0, $pos));
+                                        $j++;
+                                        $temp = substr($temp, $pos +1);
+                                        //$answer .= ']';
+                                    }
+
+                                    $answer = '';
+                                    $real_correct_tags = $correct_tags;
+                                    $chosen_list = array ();
+
+                                    for ($i = 0; $i < count($real_correct_tags); $i++) {
+                                        if ($i == 0) {
+                                            $answer .= $real_text[0];
+                                        }
+
+                                        if (!$switchable_answer_set) {
+                                            if ($correct_tags[$i] == $user_tags[$i]) {
+                                                // gives the related weighting to the student
+                                                $questionScore += $answerWeighting[$i];
+                                                // increments total score
+                                                $totalScore += $answerWeighting[$i];
+                                                // adds the word in green at the end of the string
+                                                $answer .= $correct_tags[$i];
+                                            }
+                                            // else if the word entered by the student IS NOT the same as the one defined by the professor
+                                            elseif (!empty ($user_tags[$i])) {
+                                                // adds the word in red at the end of the string, and strikes it
+                                                $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                            } else {
+                                                // adds a tabulation if no word has been typed by the student
+                                                $answer .= '&nbsp;&nbsp;&nbsp;';
+                                            }
+                                        } else {
+                                            // switchable fill in the blanks
+                                            if (in_array($user_tags[$i], $correct_tags)) {
+                                                $chosen_list[] = $user_tags[$i];
+                                                $correct_tags = array_diff($correct_tags, $chosen_list);
+
+                                                // gives the related weighting to the student
+                                                $questionScore += $answerWeighting[$i];
+                                                // increments total score
+                                                $totalScore += $answerWeighting[$i];
+                                                // adds the word in green at the end of the string
+                                                $answer .= $user_tags[$i];
+                                            }
+                                            elseif (!empty ($user_tags[$i])) {
+                                                // else if the word entered by the student IS NOT the same as the one defined by the professor
+                                                // adds the word in red at the end of the string, and strikes it
+                                                $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                            } else {
+                                                // adds a tabulation if no word has been typed by the student
+                                                $answer .= '&nbsp;&nbsp;&nbsp;';
+                                            }
+                                        }
+                                        // adds the correct word, followed by ] to close the blank
+                                        $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
+                                        if (isset ($real_text[$i +1])) {
+                                            $answer .= $real_text[$i +1];
+                                        }
+                                    }
+
+                                    break;
+                                    // for free answer
+                                case FREE_ANSWER :
+                                    $studentChoice = $choice;
+
+                                    if ($studentChoice) {
+                                        //Score is at -1 because the question has'nt been corected
+                                        $questionScore = -1;
+                                        $totalScore += 0;
+                                    }
+                                    break;
+                                    // for matching
+                                case MATCHING :
+
+                                    $numAnswer=$objAnswerTmp->selectAutoId($answerId);
+                                    if ($answerCorrect) {										
+                                        if ($answerCorrect == $choice[$numAnswer]) {											
+                                            $questionScore+=$answerWeighting;
+                                            $totalScore+=$answerWeighting;
+                                        }
+                                        $matching[$numAnswer] =  $choice[$numAnswer];
+                                    }
+                                    break;
+                                    // for hotspot with no order
+                                case HOT_SPOT :
+                                    $studentChoice = $choice[$answerId];
+                                    if ($studentChoice) {
+                                        $questionScore += $answerWeighting;
+                                        $totalScore += $answerWeighting;
+                                    }
+                                    break;
+                                    // for hotspot with fixed order
+                                case HOT_SPOT_ORDER :
+                                    $studentChoice = $choice['order'][$answerId];
+
+                                    if ($studentChoice == $answerId) {
+                                        $questionScore += $answerWeighting;
+                                        $totalScore += $answerWeighting;
+                                        $studentChoice = true;
+                                    } else {
+                                        $studentChoice = false;
+                                    }
+                                    break;
+                            } // end switch Answertype
+                        } // end for that loops over all answers of the current question
+                        // destruction of Answer
+                        
+                        //we add the total score after dealing with the answers
+                        if ($answerType == MULTIPLE_ANSWER_COMBINATION) {
+                            if ($final_answer) {
+                                //getting only the first score where we save the weight of all the question 
+                                $answerWeighting=$objAnswerTmp->selectWeighting(1);
+                                $questionScore+=$answerWeighting;
+                                $totalScore+=$answerWeighting;
+                            }
+                        }
+                        
+                        unset ($objAnswerTmp);
+
+                        $i++;
+
+                        $totalWeighting += $questionWeighting;
+                        //added by priya saini
+                        // Store results directly in the database
+                        // For all in one page exercises, the results will be
+                        // stored by exercise_results.php (using the session)
+                        if ($_configuration['tracking_enabled']) {
+                            if (empty ($choice)) {
+                                $choice = 0;
+                            }
+                            if ($answerType == MULTIPLE_ANSWER) {
+                                if ($choice != 0) {
+                                    $reply = array_keys($choice);
+                                    for ($i = 0; $i < sizeof($reply); $i++) {
+                                        $ans = $reply[$i];
+                                        exercise_attempt($questionScore, $ans, $quesId, $exeId, $i);
+                                    }
+                                } else {
+                                    exercise_attempt($questionScore, 0, $quesId, $exeId, 0);
+                                }
+                            } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
+                                if ($choice != 0) {
+                                    $reply = array_keys($choice);
+                                    for ($i = 0; $i < sizeof($reply); $i++) {
+                                        $ans = $reply[$i];
+                                        exercise_attempt($questionScore, $ans, $quesId, $exeId, $i);
+                                    }
+                                } else {
+                                    exercise_attempt($questionScore, 0, $quesId, $exeId, 0);
+                                }
+                            } elseif ($answerType == MATCHING) {
+                                foreach ($matching as $j => $val) {
+                                    exercise_attempt($questionScore, $val, $quesId, $exeId, $j);
+                                }
+                            } elseif ($answerType == FREE_ANSWER) {
+                                $answer = $choice;
+                                exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
+                            } elseif ($answerType == UNIQUE_ANSWER) {
+                                $answer = $choice;
+                                exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
+                            } elseif ($answerType == HOT_SPOT) {
+                                exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
+                                if (is_array($exerciseResultCoordinates[$key])) {
+                                    foreach($exerciseResultCoordinates[$key] as $idx => $val) {										
+                                        exercise_attempt_hotspot($exeId,$quesId,$idx,$choice[$idx],$val);
+                                    }
+                                }
+                            } else {
+                                exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
+                            }
+                        }
+                    }
+                    // end huge foreach() block that loops over all questions
+                    //at loops over all questions
+                    if (isset($exe_id)) {						
+                        $sql_update = 'UPDATE ' . $stat_table . ' SET exe_result = exe_result + ' . (int) $totalScore . ',exe_weighting = exe_weighting + ' . (int) $totalWeighting . ' WHERE exe_id = ' . Database::escape_string($exe_id);
+                        Database::query($sql_update, __FILE__, __LINE__);
+                    }
+
+                    //END of saving and qualifying
+                    //------------------------------------------------------------------------------------------
+                    //
+                }
+            }
+        }
+        if ($debug > 0) {
+            echo str_repeat('&nbsp;', 0) . '$choice is an array - end' . "<br />\n";
+        }
+    }
+
+    // the script "exercise_result.php" will take the variable $exerciseResult from the session
+    api_session_register('exerciseResult');
+    api_session_register('exerciseResultCoordinates');
+    
+    // if all questions on one page OR if it is the last question (only for an exercise with one question per page)
 
     if ($exerciseType == ALL_ON_ONE_PAGE || $questionNum >= $nbrQuestions) {
-		if ($debug > 0) {
-			echo str_repeat('&nbsp;', 0) . 'Redirecting to exercise_result.php - Remove debug option to let this happen' . "<br />\n";
-		}
-
-		if ( api_is_allowed_to_session_edit() ) {
-			// goes to the script that will show the result of the exercise
-			if ($exerciseType == ALL_ON_ONE_PAGE) {
-				header("Location: exercise_result.php?exerciseType=$exerciseType&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
-			} else {
-				if ($exe_id != '') {
-					//Verify if the current test is fraudulent
-				    $current_time = time();
-
-				    if (isset($_SESSION['expired_time']) && $exercise_row['expired_time'] != 0) {
-				    	$expired_date = $_SESSION['expired_time'];
-				    	$expired_time = strtotime($expired_date);
-					    
-					    //Validation in case of fraud
-					    $total_time_allowed = $expired_time + 30;
-					    if ($total_time_allowed < $current_time) {
-					    	$sql_exe_result = ",exe_result = 0";
-					    }
-				    				    	
-				    } else {
-				    	$sql_exe_result = "";
-				    }
-				
-
-					//clean incomplete
-					$update_query = 'UPDATE ' . $stat_table . ' SET ' . "status = '', data_tracking='', exe_date = '" . date('Y-m-d H:i:s') . "' $sql_exe_result " . ' WHERE exe_id = ' . Database::escape_string($exe_id);
-					Database::query($update_query, __FILE__, __LINE__);
-				}
-				header("Location: exercise_show.php?id=$exe_id&exerciseType=$exerciseType&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
-			}
-			exit ();
-		} else {
-			header("Location: exercice_submit.php?exerciseId=$exerciseId");
-			exit;
-		}
-	}
-
-	if ($debug > 0) {
-		echo str_repeat('&nbsp;', 0) . '$formSent was set - end' . "<br />\n";
-	}
+        if ($debug > 0) {
+            echo str_repeat('&nbsp;', 0) . 'Redirecting to exercise_result.php - Remove debug option to let this happen' . "<br />\n";
+        }
+
+        if ( api_is_allowed_to_session_edit() ) {
+            // goes to the script that will show the result of the exercise
+            if ($exerciseType == ALL_ON_ONE_PAGE) {
+                header("Location: exercise_result.php?exerciseType=$exerciseType&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
+            } else {
+                if ($exe_id != '') {
+                    //Verify if the current test is fraudulent
+                    $current_time = time();
+
+                    if (isset($_SESSION['expired_time']) && $exercise_row['expired_time'] != 0) {
+                        $expired_date = $_SESSION['expired_time'];
+                        $expired_time = strtotime($expired_date);
+                        
+                        //Validation in case of fraud
+                        $total_time_allowed = $expired_time + 30;
+                        if ($total_time_allowed < $current_time) {
+                            $sql_exe_result = ",exe_result = 0";
+                        }
+                                            
+                    } else {
+                        $sql_exe_result = "";
+                    }
+                
+
+                    //clean incomplete
+                    $update_query = 'UPDATE ' . $stat_table . ' SET ' . "status = '', data_tracking='', exe_date = '" . date('Y-m-d H:i:s') . "' $sql_exe_result " . ' WHERE exe_id = ' . Database::escape_string($exe_id);
+                    Database::query($update_query, __FILE__, __LINE__);
+                }
+                header("Location: exercise_show.php?id=$exe_id&exerciseType=$exerciseType&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
+            }
+            exit ();
+        } else {
+            header("Location: exercice_submit.php?exerciseId=$exerciseId");
+            exit;
+        }
+    }
+
+    if ($debug > 0) {
+        echo str_repeat('&nbsp;', 0) . '$formSent was set - end' . "<br />\n";
+    }
 }
 
 // if the object is not in the session
@@ -760,33 +773,33 @@ if ($formSent) {
 //why destroying the exercise when a LP is loaded ?
 //if (!isset($_SESSION['objExercise']) || $origin == 'learnpath' || $_SESSION['objExercise']->id != $_REQUEST['exerciseId']) {
 if (!isset ($_SESSION['objExercise']) || $_SESSION['objExercise']->id != $_REQUEST['exerciseId']) {
-	if ($debug > 0) {
-		echo str_repeat('&nbsp;', 0) . '$_SESSION[objExercise] was unset' . "<br />\n";
-	}
-	// construction of Exercise
-	$objExercise = new Exercise();
-	unset ($_SESSION['questionList']);
-
-	// if the specified exercise doesn't exist or is disabled
-	if (!$objExercise->read($exerciseId) || (!$objExercise->selectStatus() && !$is_allowedToEdit && ($origin != 'learnpath'))) {
-		unset ($objExercise);
-		$error = get_lang('ExerciseNotFound');
-		//die(get_lang('ExerciseNotFound'));
-	} else {
-		// saves the object into the session
-		api_session_register('objExercise');
-		if ($debug > 0) {
-			echo str_repeat('&nbsp;', 0) . '$_SESSION[objExercise] was unset - set now - end' . "<br />\n";
-		}
-	}
+    if ($debug > 0) {
+        echo str_repeat('&nbsp;', 0) . '$_SESSION[objExercise] was unset' . "<br />\n";
+    }
+    // construction of Exercise
+    $objExercise = new Exercise();
+    unset ($_SESSION['questionList']);
+
+    // if the specified exercise doesn't exist or is disabled
+    if (!$objExercise->read($exerciseId) || (!$objExercise->selectStatus() && !$is_allowedToEdit && ($origin != 'learnpath'))) {
+        unset ($objExercise);
+        $error = get_lang('ExerciseNotFound');
+        //die(get_lang('ExerciseNotFound'));
+    } else {
+        // saves the object into the session
+        api_session_register('objExercise');
+        if ($debug > 0) {
+            echo str_repeat('&nbsp;', 0) . '$_SESSION[objExercise] was unset - set now - end' . "<br />\n";
+        }
+    }
 }
 
 if (!isset ($objExcercise) && isset ($_SESSION['objExercise'])) {
-	$objExercise = $_SESSION['objExercise'];
+    $objExercise = $_SESSION['objExercise'];
 }
 if (!is_object($objExercise)) {
-	header('Location: exercice.php');
-	exit ();
+    header('Location: exercice.php');
+    exit ();
 }
 $Exe_starttime = $objExercise->start_time;
 $Exe_endtime = $objExercise->end_time;
@@ -804,37 +817,37 @@ $table_quiz_test = Database :: get_course_table(TABLE_QUIZ_TEST);
 //in LP's is enabled the "remember question" feature?
 $my_exe_id = Security :: remove_XSS($_GET['exerciseId']);
 if (!isset ($_SESSION['questionList'])) {
-	if ($debug > 0) {
-		echo str_repeat('&nbsp;', 0) . '$_SESSION[questionList] was unset' . "<br />\n";
-	}
-	// selects the list of question ID
-	$my_question_list = array ();
-	$questionList = ($randomQuestions ? $objExercise->selectRandomList() : $objExercise->selectQuestionList());
-	// saves the question list into the session
-	$sql = 'SELECT random FROM ' . $table_quiz_test . ' WHERE id="' . Database :: escape_string($my_exe_id) . '";';
-	$rs = Database::query($sql, __FILE__, __LINE__);
-	$row_number = Database :: fetch_array($rs);
-	$z = 0;
-
-	if ($row_number['random'] <> 0) {
-		foreach ($questionList as $infoquestionList) {
-			if ($z < $row_number['random']) {
-				$my_question_list[$z] = $infoquestionList;
-			} else {
-				break;
-			}
-			$z++;
-		}
-		// $questionList=array();
-		$questionList = $my_question_list;
-	}
-	api_session_register('questionList');
-	if ($debug > 0) {
-		echo str_repeat('&nbsp;', 0) . '$_SESSION[questionList] was unset - set now - end' . "<br />\n";
-	}
+    if ($debug > 0) {
+        echo str_repeat('&nbsp;', 0) . '$_SESSION[questionList] was unset' . "<br />\n";
+    }
+    // selects the list of question ID
+    $my_question_list = array ();
+    $questionList = ($randomQuestions ? $objExercise->selectRandomList() : $objExercise->selectQuestionList());
+    // saves the question list into the session
+    $sql = 'SELECT random FROM ' . $table_quiz_test . ' WHERE id="' . Database :: escape_string($my_exe_id) . '";';
+    $rs = Database::query($sql, __FILE__, __LINE__);
+    $row_number = Database :: fetch_array($rs);
+    $z = 0;
+
+    if ($row_number['random'] <> 0) {
+        foreach ($questionList as $infoquestionList) {
+            if ($z < $row_number['random']) {
+                $my_question_list[$z] = $infoquestionList;
+            } else {
+                break;
+            }
+            $z++;
+        }
+        // $questionList=array();
+        $questionList = $my_question_list;
+    }
+    api_session_register('questionList');
+    if ($debug > 0) {
+        echo str_repeat('&nbsp;', 0) . '$_SESSION[questionList] was unset - set now - end' . "<br />\n";
+    }
 }
 if (!isset ($objExcercise) && isset ($_SESSION['objExercise'])) {
-	$questionList = $_SESSION['questionList'];
+    $questionList = $_SESSION['questionList'];
 }
 
 $quizStartTime = time();
@@ -842,175 +855,175 @@ api_session_register('quizStartTime');
 $nbrQuestions = sizeof($questionList);
 // if questionNum comes from POST and not from GET
 if (!$questionNum || $_POST['questionNum']) {
-	// only used for sequential exercises (see $exerciseType)
-	if (!$questionNum) {
-		$questionNum = 1;
-	} else {
-		$questionNum++;
-	}
+    // only used for sequential exercises (see $exerciseType)
+    if (!$questionNum) {
+        $questionNum = 1;
+    } else {
+        $questionNum++;
+    }
 }
 
 if (!empty ($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
-	$_SESSION['gradebook'] = Security :: remove_XSS($_GET['gradebook']);
-	$gradebook = $_SESSION['gradebook'];
+    $_SESSION['gradebook'] = Security :: remove_XSS($_GET['gradebook']);
+    $gradebook = $_SESSION['gradebook'];
 }
 elseif (empty ($_GET['gradebook'])) {
-	unset ($_SESSION['gradebook']);
-	$gradebook = '';
+    unset ($_SESSION['gradebook']);
+    $gradebook = '';
 }
 
 if (!empty ($gradebook) && $gradebook == 'view') {
-	$interbreadcrumb[] = array (
-		'url' => '../gradebook/' . $_SESSION['gradebook_dest'],
-		'name' => get_lang('Gradebook')
-	);
+    $interbreadcrumb[] = array (
+        'url' => '../gradebook/' . $_SESSION['gradebook_dest'],
+        'name' => get_lang('Gradebook')
+    );
 }
 //$nameTools=get_lang('Exercice');
 
 $interbreadcrumb[] = array (
-	"url" => "exercice.php?gradebook=$gradebook",
-	"name" => get_lang('Exercices')
+    "url" => "exercice.php?gradebook=$gradebook",
+    "name" => get_lang('Exercices')
 );
 $interbreadcrumb[] = array (
-	"url" => api_get_self()."?gradebook=$gradebook",
-	"name" => $exerciseTitle
+    "url" => api_get_self()."?gradebook=$gradebook",
+    "name" => $exerciseTitle
 );
 
 if ($origin != 'learnpath') { //so we are not in learnpath tool
 
-	$htmlHeadXtra[] = "<script type=\"text/javascript\" src=\"../plugin/hotspot/JavaScriptFlashGateway.js\"></script>
-						<script src=\"../plugin/hotspot/hotspot.js\" type=\"text/javascript\"></script>
-						<script language=\"JavaScript\" type=\"text/javascript\">
-						<!--
-						// -----------------------------------------------------------------------------
-						// Globals
-						// Major version of Flash required
-						var requiredMajorVersion = 7;
-						// Minor version of Flash required
-						var requiredMinorVersion = 0;
-						// Minor version of Flash required
-						var requiredRevision = 0;
-						// the version of javascript supported
-						var jsVersion = 1.0;
-						// -----------------------------------------------------------------------------
-						// -->
-						</script>
-						<script language=\"VBScript\" type=\"text/vbscript\">
-						<!-- // Visual basic helper required to detect Flash Player ActiveX control version information
-						Function VBGetSwfVer(i)
-						  on error resume next
-						  Dim swControl, swVersion
-						  swVersion = 0
-
-						  set swControl = CreateObject(\"ShockwaveFlash.ShockwaveFlash.\" + CStr(i))
-						  if (IsObject(swControl)) then
-						    swVersion = swControl.GetVariable(\"\$version\")
-						  end if
-						  VBGetSwfVer = swVersion
-						End Function
-						// -->
-						</script>
-
-						<script language=\"JavaScript1.1\" type=\"text/javascript\">
-						<!-- // Detect Client Browser type
-						var isIE  = (navigator.appVersion.indexOf(\"MSIE\") != -1) ? true : false;
-						var isWin = (navigator.appVersion.toLowerCase().indexOf(\"win\") != -1) ? true : false;
-						var isOpera = (navigator.userAgent.indexOf(\"Opera\") != -1) ? true : false;
-						jsVersion = 1.1;
-						// JavaScript helper required to detect Flash Player PlugIn version information
-						function JSGetSwfVer(i){
-							// NS/Opera version >= 3 check for Flash plugin in plugin array
-							if (navigator.plugins != null && navigator.plugins.length > 0) {
-								if (navigator.plugins[\"Shockwave Flash 2.0\"] || navigator.plugins[\"Shockwave Flash\"]) {
-									var swVer2 = navigator.plugins[\"Shockwave Flash 2.0\"] ? \" 2.0\" : \"\";
-						      		var flashDescription = navigator.plugins[\"Shockwave Flash\" + swVer2].description;
-									descArray = flashDescription.split(\" \");
-									tempArrayMajor = descArray[2].split(\".\");
-									versionMajor = tempArrayMajor[0];
-									versionMinor = tempArrayMajor[1];
-									if ( descArray[3] != \"\" ) {
-										tempArrayMinor = descArray[3].split(\"r\");
-									} else {
-										tempArrayMinor = descArray[4].split(\"r\");
-									}
-						      		versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
-						            flashVer = versionMajor + \".\" + versionMinor + \".\" + versionRevision;
-						      	} else {
-									flashVer = -1;
-								}
-							}
-							// MSN/WebTV 2.6 supports Flash 4
-							else if (navigator.userAgent.toLowerCase().indexOf(\"webtv/2.6\") != -1) flashVer = 4;
-							// WebTV 2.5 supports Flash 3
-							else if (navigator.userAgent.toLowerCase().indexOf(\"webtv/2.5\") != -1) flashVer = 3;
-							// older WebTV supports Flash 2
-							else if (navigator.userAgent.toLowerCase().indexOf(\"webtv\") != -1) flashVer = 2;
-							// Can't detect in all other cases
-							else {
-
-								flashVer = -1;
-							}
-							return flashVer;
-						}
-						// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-						function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-						{
-						 	reqVer = parseFloat(reqMajorVer + \".\" + reqRevision);
-						   	// loop backwards through the versions until we find the newest version
-							for (i=25;i>0;i--) {
-								if (isIE && isWin && !isOpera) {
-									versionStr = VBGetSwfVer(i);
-								} else {
-									versionStr = JSGetSwfVer(i);
-								}
-								if (versionStr == -1 ) {
-									return false;
-								} else if (versionStr != 0) {
-									if(isIE && isWin && !isOpera) {
-										tempArray         = versionStr.split(\" \");
-										tempString        = tempArray[1];
-										versionArray      = tempString .split(\",\");
-									} else {
-										versionArray      = versionStr.split(\".\");
-									}
-									versionMajor      = versionArray[0];
-									versionMinor      = versionArray[1];
-									versionRevision   = versionArray[2];
-
-									versionString     = versionMajor + \".\" + versionRevision;   // 7.0r24 == 7.24
-									versionNum        = parseFloat(versionString);
-						        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-									if ( (versionMajor > reqMajorVer) && (versionNum >= reqVer) ) {
-										return true;
-									} else {
-										return ((versionNum >= reqVer && versionMinor >= reqMinorVer) ? true : false );
-									}
-								}
-							}
-						}
-						// -->
-						</script>";
-	    Display :: display_header($nameTools, "Exercise");
-	if (!api_is_allowed_to_session_edit() ) {
-		Display :: display_warning_message(get_lang('SessionIsReadOnly'));
-	}
+    $htmlHeadXtra[] = "<script type=\"text/javascript\" src=\"../plugin/hotspot/JavaScriptFlashGateway.js\"></script>
+                        <script src=\"../plugin/hotspot/hotspot.js\" type=\"text/javascript\"></script>
+                        <script language=\"JavaScript\" type=\"text/javascript\">
+                        <!--
+                        // -----------------------------------------------------------------------------
+                        // Globals
+                        // Major version of Flash required
+                        var requiredMajorVersion = 7;
+                        // Minor version of Flash required
+                        var requiredMinorVersion = 0;
+                        // Minor version of Flash required
+                        var requiredRevision = 0;
+                        // the version of javascript supported
+                        var jsVersion = 1.0;
+                        // -----------------------------------------------------------------------------
+                        // -->
+                        </script>
+                        <script language=\"VBScript\" type=\"text/vbscript\">
+                        <!-- // Visual basic helper required to detect Flash Player ActiveX control version information
+                        Function VBGetSwfVer(i)
+                          on error resume next
+                          Dim swControl, swVersion
+                          swVersion = 0
+
+                          set swControl = CreateObject(\"ShockwaveFlash.ShockwaveFlash.\" + CStr(i))
+                          if (IsObject(swControl)) then
+                            swVersion = swControl.GetVariable(\"\$version\")
+                          end if
+                          VBGetSwfVer = swVersion
+                        End Function
+                        // -->
+                        </script>
+
+                        <script language=\"JavaScript1.1\" type=\"text/javascript\">
+                        <!-- // Detect Client Browser type
+                        var isIE  = (navigator.appVersion.indexOf(\"MSIE\") != -1) ? true : false;
+                        var isWin = (navigator.appVersion.toLowerCase().indexOf(\"win\") != -1) ? true : false;
+                        var isOpera = (navigator.userAgent.indexOf(\"Opera\") != -1) ? true : false;
+                        jsVersion = 1.1;
+                        // JavaScript helper required to detect Flash Player PlugIn version information
+                        function JSGetSwfVer(i){
+                            // NS/Opera version >= 3 check for Flash plugin in plugin array
+                            if (navigator.plugins != null && navigator.plugins.length > 0) {
+                                if (navigator.plugins[\"Shockwave Flash 2.0\"] || navigator.plugins[\"Shockwave Flash\"]) {
+                                    var swVer2 = navigator.plugins[\"Shockwave Flash 2.0\"] ? \" 2.0\" : \"\";
+                                    var flashDescription = navigator.plugins[\"Shockwave Flash\" + swVer2].description;
+                                    descArray = flashDescription.split(\" \");
+                                    tempArrayMajor = descArray[2].split(\".\");
+                                    versionMajor = tempArrayMajor[0];
+                                    versionMinor = tempArrayMajor[1];
+                                    if ( descArray[3] != \"\" ) {
+                                        tempArrayMinor = descArray[3].split(\"r\");
+                                    } else {
+                                        tempArrayMinor = descArray[4].split(\"r\");
+                                    }
+                                    versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
+                                    flashVer = versionMajor + \".\" + versionMinor + \".\" + versionRevision;
+                                } else {
+                                    flashVer = -1;
+                                }
+                            }
+                            // MSN/WebTV 2.6 supports Flash 4
+                            else if (navigator.userAgent.toLowerCase().indexOf(\"webtv/2.6\") != -1) flashVer = 4;
+                            // WebTV 2.5 supports Flash 3
+                            else if (navigator.userAgent.toLowerCase().indexOf(\"webtv/2.5\") != -1) flashVer = 3;
+                            // older WebTV supports Flash 2
+                            else if (navigator.userAgent.toLowerCase().indexOf(\"webtv\") != -1) flashVer = 2;
+                            // Can't detect in all other cases
+                            else {
+
+                                flashVer = -1;
+                            }
+                            return flashVer;
+                        }
+                        // When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+                        function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+                        {
+                            reqVer = parseFloat(reqMajorVer + \".\" + reqRevision);
+                            // loop backwards through the versions until we find the newest version
+                            for (i=25;i>0;i--) {
+                                if (isIE && isWin && !isOpera) {
+                                    versionStr = VBGetSwfVer(i);
+                                } else {
+                                    versionStr = JSGetSwfVer(i);
+                                }
+                                if (versionStr == -1 ) {
+                                    return false;
+                                } else if (versionStr != 0) {
+                                    if(isIE && isWin && !isOpera) {
+                                        tempArray         = versionStr.split(\" \");
+                                        tempString        = tempArray[1];
+                                        versionArray      = tempString .split(\",\");
+                                    } else {
+                                        versionArray      = versionStr.split(\".\");
+                                    }
+                                    versionMajor      = versionArray[0];
+                                    versionMinor      = versionArray[1];
+                                    versionRevision   = versionArray[2];
+
+                                    versionString     = versionMajor + \".\" + versionRevision;   // 7.0r24 == 7.24
+                                    versionNum        = parseFloat(versionString);
+                                    // is the major.revision >= requested major.revision AND the minor version >= requested minor
+                                    if ( (versionMajor > reqMajorVer) && (versionNum >= reqVer) ) {
+                                        return true;
+                                    } else {
+                                        return ((versionNum >= reqVer && versionMinor >= reqMinorVer) ? true : false );
+                                    }
+                                }
+                            }
+                        }
+                        // -->
+                        </script>";
+        Display :: display_header($nameTools, "Exercise");
+    if (!api_is_allowed_to_session_edit() ) {
+        Display :: display_warning_message(get_lang('SessionIsReadOnly'));
+    }
 } else {
-	if (empty ($charset)) {
-		$charset = 'ISO-8859-15';
-	}
-	/*
-	 * HTML HEADER
-	 */
-	Display::display_reduced_header();
-	echo '<div style="height:10px">&nbsp;</div>';
+    if (empty ($charset)) {
+        $charset = 'ISO-8859-15';
+    }
+    /*
+     * HTML HEADER
+     */
+    Display::display_reduced_header();
+    echo '<div style="height:10px">&nbsp;</div>';
 }
 
 // I'm in a preview mode
 if (api_is_course_admin() && $origin != 'learnpath') {	
-	echo '<div class="actions">';
-	echo Display :: return_icon('quiz.gif', get_lang('GoBackToEx')) . '<a href="admin.php?' . api_get_cidreq() . '&exerciseId=' . $objExercise->id . '">' . get_lang('GoBackToEx') . '</a>';
-	echo Display :: return_icon('edit.gif', get_lang('ModifyExercise')) . '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">' . get_lang('ModifyExercise') . '</a>';
-	echo '</div>';
+    echo '<div class="actions">';
+    echo Display :: return_icon('quiz.gif', get_lang('GoBackToEx')) . '<a href="admin.php?' . api_get_cidreq() . '&exerciseId=' . $objExercise->id . '">' . get_lang('GoBackToEx') . '</a>';
+    echo Display :: return_icon('edit.gif', get_lang('ModifyExercise')) . '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">' . get_lang('ModifyExercise') . '</a>';
+    echo '</div>';
 }
 //Timer control
 if ($exercise_row['expired_time'] != 0) { 
@@ -1020,233 +1033,233 @@ $exerciseTitle = api_parse_tex($exerciseTitle);
 echo "<h3>" . $exerciseTitle . "</h3>";
 
 if ($exerciseAttempts > 0) {
-	$user_id = api_get_user_id();
-	$course_code = api_get_course_id();
-	$sql = "SELECT count(*) FROM $stat_table WHERE exe_exo_id = '$quizID'
-				AND exe_user_id = '$user_id'
-				AND status != 'incomplete'
-				AND orig_lp_id = $safe_lp_id
-				AND orig_lp_item_id = $safe_lp_item_id
-	            AND exe_cours_id = '$course_code' AND session_id = '" . (int) $_SESSION['id_session'] . "'";
-
-	$aquery = Database::query($sql, __FILE__, __LINE__);
-	$attempt = Database :: fetch_array($aquery);
-
-	if ($attempt[0] >= $exerciseAttempts) {
-		if (!api_is_allowed_to_edit(null,true)) {
-			Display :: display_warning_message(sprintf(get_lang('ReachedMaxAttempts'), $exerciseTitle, $exerciseAttempts), false);
-			if ($origin != 'learnpath')
-				Display :: display_footer();
-			exit;
-		} else {
-			Display :: display_warning_message(sprintf(get_lang('ReachedMaxAttemptsAdmin'), $exerciseTitle, $exerciseAttempts), false);
-		}
-	}
+    $user_id = api_get_user_id();
+    $course_code = api_get_course_id();
+    $sql = "SELECT count(*) FROM $stat_table WHERE exe_exo_id = '$quizID'
+                AND exe_user_id = '$user_id'
+                AND status != 'incomplete'
+                AND orig_lp_id = $safe_lp_id
+                AND orig_lp_item_id = $safe_lp_item_id
+                AND exe_cours_id = '$course_code' AND session_id = '" . (int) $_SESSION['id_session'] . "'";
+
+    $aquery = Database::query($sql, __FILE__, __LINE__);
+    $attempt = Database :: fetch_array($aquery);
+
+    if ($attempt[0] >= $exerciseAttempts) {
+        if (!api_is_allowed_to_edit(null,true)) {
+            Display :: display_warning_message(sprintf(get_lang('ReachedMaxAttempts'), $exerciseTitle, $exerciseAttempts), false);
+            if ($origin != 'learnpath')
+                Display :: display_footer();
+            exit;
+        } else {
+            Display :: display_warning_message(sprintf(get_lang('ReachedMaxAttemptsAdmin'), $exerciseTitle, $exerciseAttempts), false);
+        }
+    }
 }
 
 if (!function_exists('convert_date_to_number')) {
-	function convert_date_to_number($default) {
-		// 2008-10-12 00:00:00 ---to--> 12345672218 (timestamp)
-		$parts = split(' ', $default);
-		list ($d_year, $d_month, $d_day) = split('-', $parts[0]);
-		list ($d_hour, $d_minute, $d_second) = split(':', $parts[1]);
-		return mktime($d_hour, $d_minute, $d_second, $d_month, $d_day, $d_year);
-	}
+    function convert_date_to_number($default) {
+        // 2008-10-12 00:00:00 ---to--> 12345672218 (timestamp)
+        $parts = split(' ', $default);
+        list ($d_year, $d_month, $d_day) = split('-', $parts[0]);
+        list ($d_hour, $d_minute, $d_second) = split(':', $parts[1]);
+        return mktime($d_hour, $d_minute, $d_second, $d_month, $d_day, $d_year);
+    }
 }
 
 $limit_time_exists = (($Exe_starttime != '0000-00-00 00:00:00') || ($Exe_endtime != '0000-00-00 00:00:00')) ? true : false;
 if ($limit_time_exists) {
-	$exercise_start_time = convert_date_to_number($Exe_starttime);
-	$exercise_end_time = convert_date_to_number($Exe_endtime);
-	$time_now = convert_date_to_number(date('Y-m-d H:i:s'));
-	$permission_to_start = (($time_now - $exercise_start_time) > 0) ? true : false;
-	if ($_SERVER['REQUEST_METHOD'] != 'POST')
-		$exercise_timeover = (($time_now - $exercise_end_time) > 0) ? true : false;
-	if ($permission_to_start == false || $exercise_timeover == true) { //
-		if (!api_is_allowed_to_edit(null,true)) {
-			$message_warning = ($permission_to_start == false) ? get_lang('ExerciseNoStartedYet') : get_lang('ReachedTimeLimit');
-			Display :: display_warning_message(sprintf($message_warning, $exerciseTitle, $exerciseAttempts));
-			Display :: display_footer();
-			exit;
-		} else {
-			$message_warning = ($permission_to_start == false) ? get_lang('ExerciseNoStartedAdmin') : get_lang('ReachedTimeLimitAdmin');
-			Display :: display_warning_message(sprintf($message_warning, $exerciseTitle, $exerciseAttempts));
-		}
-	}
+    $exercise_start_time = convert_date_to_number($Exe_starttime);
+    $exercise_end_time = convert_date_to_number($Exe_endtime);
+    $time_now = convert_date_to_number(date('Y-m-d H:i:s'));
+    $permission_to_start = (($time_now - $exercise_start_time) > 0) ? true : false;
+    if ($_SERVER['REQUEST_METHOD'] != 'POST')
+        $exercise_timeover = (($time_now - $exercise_end_time) > 0) ? true : false;
+    if ($permission_to_start == false || $exercise_timeover == true) { //
+        if (!api_is_allowed_to_edit(null,true)) {
+            $message_warning = ($permission_to_start == false) ? get_lang('ExerciseNoStartedYet') : get_lang('ReachedTimeLimit');
+            Display :: display_warning_message(sprintf($message_warning, $exerciseTitle, $exerciseAttempts));
+            Display :: display_footer();
+            exit;
+        } else {
+            $message_warning = ($permission_to_start == false) ? get_lang('ExerciseNoStartedAdmin') : get_lang('ReachedTimeLimitAdmin');
+            Display :: display_warning_message(sprintf($message_warning, $exerciseTitle, $exerciseAttempts));
+        }
+    }
 }
 
 if (!empty ($error)) {
-	Display :: display_error_message($error, false);
+    Display :: display_error_message($error, false);
 } else {
-	if (!empty ($exerciseSound)) {
-		echo "<a href=\"../document/download.php?doc_url=%2Faudio%2F" . Security::remove_XSS($exerciseSound) . "\" target=\"_blank\">", "<img src=\"../img/sound.gif\" border=\"0\" align=\"absmiddle\" alt=", get_lang('Sound') .
-		"\" /></a>";
-	}
-
-	// Get number of hotspot questions for javascript validation
-	$number_of_hotspot_questions = 0;
-	$onsubmit = '';
-	$i = 0;
-	//i have a doubt in this line cvargas
-	//var_dump($questionList);
-	if (!strcmp($questionList[0], '') === 0) {
-		foreach ($questionList as $questionId) {
-			$i++;
-			$objQuestionTmp = Question :: read($questionId);
-			// for sequential exercises
-			if ($exerciseType == ONE_PER_PAGE) {
-				// if it is not the right question, goes to the next loop iteration
-				if ($questionNum != $i) {
-					continue;
-				} else {
-					if ($objQuestionTmp->selectType() == HOT_SPOT) {
-						$number_of_hotspot_questions++;
-					}
-
-					break;
-				}
-			} else {
-				if ($objQuestionTmp->selectType() == HOT_SPOT) {
-					$number_of_hotspot_questions++;
-				}
-			}
-		}
-	}
-	if ($number_of_hotspot_questions > 0) {
-		$onsubmit = "onsubmit=\"return validateFlashVar('" . $number_of_hotspot_questions . "', '" . get_lang('HotspotValidateError1') . "', '" . get_lang('HotspotValidateError2') . "');\"";
-	}
-	$s = "<p>$exerciseDescription</p>";
-
-	if ($exerciseType == ONE_PER_PAGE)
-	{
-		$s2 = "&exerciseId=" . $exerciseId;
-	}
-
-	$s .= " <form method='post' action='" . api_get_self() . "?".api_get_cidreq()."&autocomplete=off&gradebook=$gradebook" . $s2 . "' id='my_frm_exercise' name='frm_exercise' $onsubmit>
-		 <input type='hidden' name='formSent' value='1' />
-		 <input type='hidden' name='exerciseType' value='" . $exerciseType . "' />
-		 <input type='hidden' name='exerciseId' value='" . $exerciseId . "' />
-		 <input type='hidden' name='questionNum' value='" . $questionNum . "' />
-		 <input type='hidden' name='nbrQuestions' value='" . $nbrQuestions . "' />
-		 <input type='hidden' name='origin' value='" . $origin . "' />
-		 <input type='hidden' name='learnpath_id' value='" . $learnpath_id . "' />
-		 <input type='hidden' name='learnpath_item_id' value='" . $learnpath_item_id . "' />
-		 <table width='100%' border='0' cellpadding='1' cellspacing='0'>
-			<tr>
-		 		<td>
-		  			<table width='100%' cellpadding='3' cellspacing='0' border='0'>";
+    if (!empty ($exerciseSound)) {
+        echo "<a href=\"../document/download.php?doc_url=%2Faudio%2F" . Security::remove_XSS($exerciseSound) . "\" target=\"_blank\">", "<img src=\"../img/sound.gif\" border=\"0\" align=\"absmiddle\" alt=", get_lang('Sound') .
+        "\" /></a>";
+    }
+
+    // Get number of hotspot questions for javascript validation
+    $number_of_hotspot_questions = 0;
+    $onsubmit = '';
+    $i = 0;
+    //i have a doubt in this line cvargas
+    //var_dump($questionList);
+    if (!strcmp($questionList[0], '') === 0) {
+        foreach ($questionList as $questionId) {
+            $i++;
+            $objQuestionTmp = Question :: read($questionId);
+            // for sequential exercises
+            if ($exerciseType == ONE_PER_PAGE) {
+                // if it is not the right question, goes to the next loop iteration
+                if ($questionNum != $i) {
+                    continue;
+                } else {
+                    if ($objQuestionTmp->selectType() == HOT_SPOT) {
+                        $number_of_hotspot_questions++;
+                    }
+
+                    break;
+                }
+            } else {
+                if ($objQuestionTmp->selectType() == HOT_SPOT) {
+                    $number_of_hotspot_questions++;
+                }
+            }
+        }
+    }
+    if ($number_of_hotspot_questions > 0) {
+        $onsubmit = "onsubmit=\"return validateFlashVar('" . $number_of_hotspot_questions . "', '" . get_lang('HotspotValidateError1') . "', '" . get_lang('HotspotValidateError2') . "');\"";
+    }
+    $s = "<p>$exerciseDescription</p>";
+
+    if ($exerciseType == ONE_PER_PAGE)
+    {
+        $s2 = "&exerciseId=" . $exerciseId;
+    }
+
+    $s .= " <form method='post' action='" . api_get_self() . "?".api_get_cidreq()."&autocomplete=off&gradebook=$gradebook" . $s2 . "' id='my_frm_exercise' name='frm_exercise' $onsubmit>
+         <input type='hidden' name='formSent' value='1' />
+         <input type='hidden' name='exerciseType' value='" . $exerciseType . "' />
+         <input type='hidden' name='exerciseId' value='" . $exerciseId . "' />
+         <input type='hidden' name='questionNum' value='" . $questionNum . "' />
+         <input type='hidden' name='nbrQuestions' value='" . $nbrQuestions . "' />
+         <input type='hidden' name='origin' value='" . $origin . "' />
+         <input type='hidden' name='learnpath_id' value='" . $learnpath_id . "' />
+         <input type='hidden' name='learnpath_item_id' value='" . $learnpath_item_id . "' />
+         <table width='100%' border='0' cellpadding='1' cellspacing='0'>
+            <tr>
+                <td>
+                    <table width='100%' cellpadding='3' cellspacing='0' border='0'>";
   echo '<div id="highlight-plugin" class="glossary-content">';                   
-	echo $s;
-	$i = 1;
-	foreach ($questionList as $questionId) {
-		// for sequential exercises
-		if ($exerciseType == ONE_PER_PAGE) {
-			// if it is not the right question, goes to the next loop iteration
-			if ($questionNum != $i) {
-				$i++;
-				continue;
-			} else {
-				if ($exerciseFeedbackType != EXERCISE_FEEDBACK_TYPE_DIRECT) {
-					// if the user has already answered this question
-					if (isset ($exerciseResult[$questionId])) {
-						// construction of the Question object
-						$objQuestionTmp = Question :: read($questionId);
-						$questionName = $objQuestionTmp->selectTitle();
-						// destruction of the Question object
-						unset ($objQuestionTmp);
-						Display :: display_normal_message(get_lang('AlreadyAnswered'));
-						$i++;
-						//echo '<tr><td>'.get_lang('AlreadyAnswered').' &quot;'.$questionName.'&quot;</td></tr>';
-						break;
-					}
-				}
-			}
-		}
-		// shows the question and its answers
-		showQuestion($questionId, false, $origin, $i, $nbrQuestions);
-		$i++;
-		// for sequential exercises
-		if ($exerciseType == ONE_PER_PAGE) {
-			// quits the loop
-			break;
-		}
-	}
-	// end foreach()
-	echo "<!-- <button type='submit' name='buttonCancel' class='cancel'>" . get_lang('Cancel') . "</button>
-		   &nbsp;&nbsp; //--><br />";
-	echo '<div style="margin-top:-10px;">';
-	$submit_btn = "<button class='next' type='submit' name='submit' name='submit_save' id='submit_save'>";
-	//	$submit_btn.=get_lang('ValidateAnswer');
-	if ($objExercise->selectFeedbackType() == 1 && $_SESSION['objExercise']->selectType() == 2) {
-		$submit_btn = '';
-		echo '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/thickbox.js" type="text/javascript"></script>';
-		echo '<style type="text/css" media="all">@import "' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/thickbox.css";</style>';
-		$hotspot_get = $_POST['hotspot'];
-		// Show a hidden div
-		echo "<script>$(document).ready( function(){
-							  $('.rounded').corners();
-							  $('.rounded_inner').corners();
-							});</script>";
-		//echo '<br /><span class="rounded" style="width: 300px; margin-top: 10px; padding: 3px; background-color:#ccc;"><span style="width: 300px" class="rounded_inner" ><a href="exercise_submit_modal.php?hotspot='.$hotspot_get.'&nbrQuestions='.$nbrQuestions.'&questionnum='.$questionNum.'&exerciseType='.$exerciseType.'&exerciseId='.$exerciseId.'&placeValuesBeforeTB_=savedValues&TB_iframe=true&height=480&width=640&modal=true" title="" class="thickbox" id="validationButton">'.get_lang('ValidateAnswer').'</a></span></span><br /><br /><br />';
-
-	} else {
-		if (api_is_allowed_to_session_edit() ) {
-			if ($exerciseType == ALL_ON_ONE_PAGE || $nbrQuestions == $questionNum) {
-				$submit_btn .= get_lang('ValidateAnswer');
+    echo $s;
+    $i = 1;
+    foreach ($questionList as $questionId) {
+        // for sequential exercises
+        if ($exerciseType == ONE_PER_PAGE) {
+            // if it is not the right question, goes to the next loop iteration
+            if ($questionNum != $i) {
+                $i++;
+                continue;
+            } else {
+                if ($exerciseFeedbackType != EXERCISE_FEEDBACK_TYPE_DIRECT) {
+                    // if the user has already answered this question
+                    if (isset ($exerciseResult[$questionId])) {
+                        // construction of the Question object
+                        $objQuestionTmp = Question :: read($questionId);
+                        $questionName = $objQuestionTmp->selectTitle();
+                        // destruction of the Question object
+                        unset ($objQuestionTmp);
+                        Display :: display_normal_message(get_lang('AlreadyAnswered'));
+                        $i++;
+                        //echo '<tr><td>'.get_lang('AlreadyAnswered').' &quot;'.$questionName.'&quot;</td></tr>';
+                        break;
+                    }
+                }
+            }
+        }
+        // shows the question and its answers
+        showQuestion($questionId, false, $origin, $i, $nbrQuestions);
+        $i++;
+        // for sequential exercises
+        if ($exerciseType == ONE_PER_PAGE) {
+            // quits the loop
+            break;
+        }
+    }
+    // end foreach()
+    echo "<!-- <button type='submit' name='buttonCancel' class='cancel'>" . get_lang('Cancel') . "</button>
+           &nbsp;&nbsp; //--><br />";
+    echo '<div style="margin-top:-10px;">';
+    $submit_btn = "<button class='next' type='submit' name='submit' name='submit_save' id='submit_save'>";
+    //	$submit_btn.=get_lang('ValidateAnswer');
+    if ($objExercise->selectFeedbackType() == 1 && $_SESSION['objExercise']->selectType() == 2) {
+        $submit_btn = '';
+        echo '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/thickbox.js" type="text/javascript"></script>';
+        echo '<style type="text/css" media="all">@import "' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/thickbox.css";</style>';
+        $hotspot_get = $_POST['hotspot'];
+        // Show a hidden div
+        echo "<script>$(document).ready( function(){
+                              $('.rounded').corners();
+                              $('.rounded_inner').corners();
+                            });</script>";
+        //echo '<br /><span class="rounded" style="width: 300px; margin-top: 10px; padding: 3px; background-color:#ccc;"><span style="width: 300px" class="rounded_inner" ><a href="exercise_submit_modal.php?hotspot='.$hotspot_get.'&nbrQuestions='.$nbrQuestions.'&questionnum='.$questionNum.'&exerciseType='.$exerciseType.'&exerciseId='.$exerciseId.'&placeValuesBeforeTB_=savedValues&TB_iframe=true&height=480&width=640&modal=true" title="" class="thickbox" id="validationButton">'.get_lang('ValidateAnswer').'</a></span></span><br /><br /><br />';
+
+    } else {
+        if (api_is_allowed_to_session_edit() ) {
+            if ($exerciseType == ALL_ON_ONE_PAGE || $nbrQuestions == $questionNum) {
+                $submit_btn .= get_lang('ValidateAnswer');
         $name_btn = get_lang('ValidateAnswer');
-			} else {
-				$submit_btn .= get_lang('NextQuestion');
+            } else {
+                $submit_btn .= get_lang('NextQuestion');
         $name_btn = get_lang('NextQuestion');
-			}
-			$submit_btn .= "</button>";
+            }
+            $submit_btn .= "</button>";
       if ($exercise_row['expired_time'] != 0) {
-      	   echo $submit_btn ="<input class='submit_next' type='submit' id='submit_save' value='".$name_btn."' name='submit_save'/>";
+           echo $submit_btn ="<input class='submit_next' type='submit' id='submit_save' value='".$name_btn."' name='submit_save'/>";
       } else {
-      	  echo $submit_btn;
+          echo $submit_btn;
       }
 
-		}
+        }
 
-	}
+    }
 
 
-	echo "</table>
-			</td>
-			</tr>
-			</table></form>";
-	$b = 2;
+    echo "</table>
+            </td>
+            </tr>
+            </table></form>";
+    $b = 2;
 }
 echo '</div>';
 
 if ($_configuration['live_exercise_tracking'] == true && $exerciseFeedbackType != EXERCISE_FEEDBACK_TYPE_DIRECT) {
-	
-	if ($table_recorded_not_exist) { //$table_recorded_not_exist
-	    if ($exercise_row['expired_time'] != 0) {
-	      $sql_fields = "expired_time_control, ";
-	      $sql_fields_values = "'"."$clock_expired_time"."',";     
-	    } else {
-	      $sql_fields = "";
-	      $sql_fields_values = "";
-	    }  
-	
-		if ($exerciseType == ONE_PER_PAGE) {
-	    	$sql = "INSERT INTO $stat_table($sql_fields exe_exo_id,exe_user_id,exe_cours_id,status,session_id,data_tracking,start_date,orig_lp_id,orig_lp_item_id)
-	      			VALUES($sql_fields_values '$exerciseId','" . api_get_user_id() . "','" . $_course['id'] . "','incomplete','" . api_get_session_id() . "','" . implode(',', $questionList) . "','" . date('Y-m-d H:i:s') . "',$safe_lp_id,$safe_lp_item_id)";
+    
+    if ($table_recorded_not_exist) { //$table_recorded_not_exist
+        if ($exercise_row['expired_time'] != 0) {
+          $sql_fields = "expired_time_control, ";
+          $sql_fields_values = "'"."$clock_expired_time"."',";     
+        } else {
+          $sql_fields = "";
+          $sql_fields_values = "";
+        }  
+    
+        if ($exerciseType == ONE_PER_PAGE) {
+            $sql = "INSERT INTO $stat_table($sql_fields exe_exo_id,exe_user_id,exe_cours_id,status,session_id,data_tracking,start_date,orig_lp_id,orig_lp_item_id)
+                    VALUES($sql_fields_values '$exerciseId','" . api_get_user_id() . "','" . $_course['id'] . "','incomplete','" . api_get_session_id() . "','" . implode(',', $questionList) . "','" . date('Y-m-d H:i:s') . "',$safe_lp_id,$safe_lp_item_id)";
      
-			Database::query($sql, __FILE__, __LINE__);      
-		} else {
-	    	echo $sql = "INSERT INTO $stat_table ($sql_fields exe_exo_id,exe_user_id,exe_cours_id,status,session_id,start_date,orig_lp_id,orig_lp_item_id)
-	       			VALUES($sql_fields_values '$exerciseId','" . api_get_user_id() . "','" . $_course['id'] . "','incomplete','" . api_get_session_id() . "','" . date('Y-m-d H:i:s') . "',$safe_lp_id,$safe_lp_item_id)";
-			Database::query($sql, __FILE__, __LINE__);
-		}
-
-	}
+            Database::query($sql, __FILE__, __LINE__);      
+        } else {
+            echo $sql = "INSERT INTO $stat_table ($sql_fields exe_exo_id,exe_user_id,exe_cours_id,status,session_id,start_date,orig_lp_id,orig_lp_item_id)
+                    VALUES($sql_fields_values '$exerciseId','" . api_get_user_id() . "','" . $_course['id'] . "','incomplete','" . api_get_session_id() . "','" . date('Y-m-d H:i:s') . "',$safe_lp_id,$safe_lp_item_id)";
+            Database::query($sql, __FILE__, __LINE__);
+        }
+
+    }
 }
 
 if ($origin != 'learnpath') {
-	//so we are not in learnpath tool
+    //so we are not in learnpath tool
   echo '</div>'; //End glossary div
-	Display :: display_footer();
+    Display :: display_footer();
 } else {
-	echo '</body></html>';
+    echo '</body></html>';
 }