From 390c26584f1de00eef4975fc3013ce61fc2fbdfe Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Sun, 14 Dec 2008 03:26:03 +0100
Subject: [PATCH] [svn r17277] logic changes - added last changes in exercises
 of  project dokeosla-usil into dokeos 1.8.6 (see FS#3249)

---
 main/exercice/exercice.php        | 987 ++++++++++++++----------------
 main/exercice/exercice_submit.php | 382 +++++-------
 2 files changed, 626 insertions(+), 743 deletions(-)

diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 1557345d30..df2cab5207 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -1,4 +1,4 @@
-<?php // $Id: exercice.php 17068 2008-12-04 07:50:33Z yannoo $
+<?php // $Id: exercice.php 17277 2008-12-14 02:26:03Z cfasanando $
  
 /*
 ==============================================================================
@@ -72,14 +72,16 @@ $is_tutor = api_is_allowed_to_edit(true);
 $TBL_USER          	    = Database::get_main_table(TABLE_MAIN_USER);
 $TBL_DOCUMENT          	= Database::get_course_table(TABLE_DOCUMENT);
 $TBL_ITEM_PROPERTY      = Database::get_course_table(TABLE_ITEM_PROPERTY);
+$TBL_EXERCICE_ANSWER	= Database::get_course_table(TABLE_QUIZ_ANSWER);
 $TBL_EXERCICE_QUESTION	= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
 $TBL_EXERCICES			= Database::get_course_table(TABLE_QUIZ_TEST);
 $TBL_QUESTIONS			= Database::get_course_table(TABLE_QUIZ_QUESTION);
 $TBL_TRACK_EXERCICES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
 $TBL_TRACK_HOTPOTATOES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 $TBL_TRACK_ATTEMPT		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+$TBL_TRACK_ATTEMPT_RECORDING = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
 
-// document path
+// document path 
 $documentPath= api_get_path(SYS_COURSE_PATH).$_course['path']."/document";
 // picture path
 $picturePath=$documentPath.'/images';
@@ -144,16 +146,14 @@ if ($show=='result' && $_REQUEST['comments']=='update' && ($is_allowedToEdit ||
 	$test  = $_GET['test'];
 	$from = $_SESSION['_user']['mail'];
 	$from_name = $_SESSION['_user']['firstName']." ".$_SESSION['_user']['lastName'];
-	$url = api_get_path(WEB_CODE_PATH).'exercice/exercice.php?'.api_get_cidreq().'&amp;show=result';
-
-	foreach ($_POST as $key=>$v)
-	{
+	$url = api_get_path(WEB_CODE_PATH).'exercice/exercice.php?'.api_get_cidreq().'&show=result';
+	$TBL_RECORDING = Database::get_statistic_table('track_e_attempt_recording');
+	foreach ($_POST as $key=>$v) {
 		$keyexp = explode('_',$key);
-		if ($keyexp[0] == "marks")
-		{
-			$sql = "SELECT question from $TBL_QUESTIONS where id = '".Database::escape_string($keyexp[1])."'";
+		if ($keyexp[0] == "marks") {
+			$sql = "select question from $TBL_QUESTIONS where id = '$keyexp[1]'";
 			$result =api_sql_query($sql, __FILE__, __LINE__);
-			$ques_name = mysql_result($result,0,"question");
+			$ques_name = Database::result($result,0,"question");
 
 			$query = "UPDATE $TBL_TRACK_ATTEMPT SET marks = '".Database::escape_string($v)."' 
 						WHERE question_id = '".Database::escape_string($keyexp[1])."' 
@@ -165,67 +165,55 @@ if ($show=='result' && $_REQUEST['comments']=='update' && ($is_allowedToEdit ||
 					GROUP BY question_id';
 
 			$res = api_sql_query($qry,__FILE__,__LINE__);
-			$tot = mysql_result($res,0,'tot');
+			$tot = Database::result($res,0,'tot');
 
 			$totquery = "update $TBL_TRACK_EXERCICES set exe_result = '".Database::escape_string($tot)."' where exe_Id='".Database::escape_string($id)."'";
 			api_sql_query($totquery, __FILE__, __LINE__);
 			
-			// if this quiz is integrated in lps, we need to update the score in lp_view_item table
-			
-			// at first we need to get the id of the quiz
-			$sql = 'SELECT exe_exo_id FROM '.$TBL_TRACK_EXERCICES.' WHERE exe_id='.intval($id);
-			$rs = api_sql_query($sql,__FILE__,__LINE__);
-			$exercise_id_to_update = intval(Database::result($rs,0,0));
-			
-			//then we need to get items where this quiz is integrated
-			$tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
-			$sql = 'SELECT * FROM '.$tbl_lp_item.' WHERE item_type="quiz" AND path='.$exercise_id_to_update;
-			$rs_items = api_sql_query($sql,__FILE__,__LINE__);
-			while($lp_item = Database::fetch_array($rs_items))
-			{
-				$tbl_lp_view = Database::get_course_table(TABLE_LP_VIEW);
-				
-				//we need to get last lp_view id of the user
-				$sql = 'SELECT id FROM '.$tbl_lp_view.' WHERE lp_id='.intval($lp_item['lp_id']).' AND user_id='.api_get_user_id().' ORDER BY view_count DESC LIMIT 1';
-				$rs_view = api_sql_query($sql,__FILE__,__LINE__);
-				if($view_id = Database::result($rs_view,0,'id'))
-				{
-					// then we can update the score of the lp_view_item row
-					$tbl_lp_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
-					$sql = 'UPDATE '.$tbl_lp_item_view.' SET score='.intval($tot).' WHERE lp_view_id='.intval($view_id).' AND lp_item_id='.intval($lp_item['id']);
-					api_sql_query($sql, __FILE__, __LINE__);
-				} 
-				
-			}			
-			
-			// select the items where this quiz is integrated
-		}
-		else
-		{
+			$recording_changes = 'INSERT INTO '.$TBL_RECORDING.' ' .
+					'(exe_id,
+					question_id,
+					marks,
+					insert_date,
+					author) 
+					VALUES
+					('."'$id','".$keyexp[1]."','$v','".date('Y-m-d H:i:s')."','".api_get_user_id()."'".')';
+			api_sql_query($recording_changes, __FILE__, __LINE__);
+		} else {
 		  $query = "UPDATE $TBL_TRACK_ATTEMPT SET teacher_comment = '".Database::escape_string($v)."' 
 		  			WHERE question_id = '".Database::escape_string($keyexp[1])."' 
 		  			AND exe_id = '".Database::escape_string($id)."'";
 		   api_sql_query($query, __FILE__, __LINE__);
-		}
+		   
+			$recording_changes = 'INSERT INTO '.$TBL_RECORDING.' ' .
+					'(exe_id,
+					question_id,
+					teacher_comment,
+					insert_date,
+					author) 
+					VALUES
+					('."'$id','".$keyexp[1]."','$v','".date('Y-m-d H:i:s')."','".api_get_user_id()."'".')';
+			api_sql_query($recording_changes, __FILE__, __LINE__);
 
-	}
+		}
 
-	$qry = 'SELECT DISTINCT question_id, marks
+}
+	
+$qry = 'SELECT DISTINCT question_id, marks
 			FROM '.$TBL_TRACK_ATTEMPT.' where exe_id = '.intval($id).'
 			GROUP BY question_id';
 
-	$res = api_sql_query($qry,__FILE__,__LINE__);
-	$tot = 0;
-	while($row = Database::fetch_array($res,'ASSOC'))
-	{
-		$tot += $row ['marks'];
-	}
+$res = api_sql_query($qry,__FILE__,__LINE__);
+$tot = 0;
+while($row = Database::fetch_array($res,'ASSOC')) {
+	$tot += $row ['marks'];
+}
 
-	$totquery = "UPDATE $TBL_TRACK_EXERCICES SET exe_result = '".Database::escape_string($tot)."' WHERE exe_Id='".Database::escape_string($id)."'";
+$totquery = "UPDATE $TBL_TRACK_EXERCICES SET exe_result = '".Database::escape_string($tot)."' WHERE exe_Id='".Database::escape_string($id)."'";
 
-	api_sql_query($totquery, __FILE__, __LINE__);
-	$subject = get_lang('ExamSheetVCC');
-	$htmlmessage = '<html>'.
+api_sql_query($totquery, __FILE__, __LINE__);
+$subject = get_lang('ExamSheetVCC');
+$htmlmessage = '<html>'.
 				'<head>' .
 				'<style type="text/css">' .
 				'<!--' .
@@ -264,40 +252,40 @@ if ($show=='result' && $_REQUEST['comments']=='update' && ($is_allowedToEdit ||
 				'  </div>' .
 				'  </body>' .
 				'  </html>';
-	$message = '<p>'.sprintf(get_lang('AttemptVCCLong'),$test).' <A href="#url#">#url#</A></p><br />';
-	$mess= str_replace("#test#",$test,$message);
-	//$message= str_replace("#ques_name#",$ques_name,$mess);
-	$message = str_replace("#url#",$url,$mess);
-	$mess = stripslashes($message);
-	$headers  = " MIME-Version: 1.0 \r\n";
-	$headers .= "User-Agent: Dokeos/1.6";
-	$headers .= "Content-Transfer-Encoding: 7bit";
-	$headers .= 'From: '.$from_name.' <'.$from.'>' . "\r\n";
-	$headers="From:$from_name\r\nReply-to: $to\r\nContent-type: text/html; charset=".($charset?$charset:'ISO-8859-15');
-	//mail($emailid, $subject, $mess,$headers);
-
-	api_mail_html($emailid, $emailid, $subject, $mess, $from_name, $from);
+$message = '<p>'.sprintf(get_lang('AttemptVCCLong'),$test).' <A href="#url#">#url#</A></p><br />';
+$mess= str_replace("#test#",$test,$message);
+//$message= str_replace("#ques_name#",$ques_name,$mess);
+$message = str_replace("#url#",$url,$mess);
+$mess = stripslashes($message);
+$headers  = " MIME-Version: 1.0 \r\n";
+$headers .= "User-Agent: Dokeos/1.6";
+$headers .= "Content-Transfer-Encoding: 7bit";
+$headers .= 'From: '.$from_name.' <'.$from.'>' . "\r\n";
+$headers="From:$from_name\r\nReply-to: $to\r\nContent-type: text/html; charset=".($charset?$charset:'ISO-8859-15');
+//mail($emailid, $subject, $mess,$headers);
+
+api_mail_html($emailid, $emailid, $subject, $mess, $from_name, $from);
 	
 
-	if(in_array($origin, array('tracking_course','user_course'))){
+if (in_array($origin, array('tracking_course','user_course'))){
 		//Redirect to the reporting		
 		header('location: ../mySpace/myStudents.php?origin='.$origin.'&student='.$_GET['student'].'&details=true&course='.$_GET['course']);
 	}
 }
+if ($_GET['gradebook'] && $_GET['exerciseId']) {
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/index.php',
+			'name' => get_lang('Gradebook')
+		);
+}
 
-if($show!='result')
-{
+if ($show!='result') {
 	$nameTools=get_lang('Exercices');
-}
-else
-{
-	if($is_allowedToEdit || $is_tutor)
-	{
+} else {
+	if($is_allowedToEdit || $is_tutor) {
 		$nameTools=get_lang('StudentScore');
 		$interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
-	}
-	else
-	{
+	} else {
 		$nameTools=get_lang('YourScore');
 		$interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
 	}
@@ -306,8 +294,7 @@ else
 // need functions of statsutils lib to display previous exercices scores
 include_once(api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php');
 
-if($is_allowedToEdit && !empty($choice) && $choice == 'exportqti2')
-{
+if ($is_allowedToEdit && !empty($choice) && $choice == 'exportqti2') {
 	require_once('export/qti2/qti2_export.php');
 	$export = export_exercise($exerciseId,true);
 
@@ -330,10 +317,8 @@ if($is_allowedToEdit && !empty($choice) && $choice == 'exportqti2')
 	rmdir($temp_zip_dir);
 	exit(); //otherwise following clicks may become buggy
 }
-if(!empty($_POST['export_user_fields']))
-{
-	switch($_POST['export_user_fields'])
-	{
+if (!empty($_POST['export_user_fields'])) {
+	switch ($_POST['export_user_fields']) {
 		case 'export_user_fields':
 			$_SESSION['export_user_fields'] = true;
 			break;
@@ -343,19 +328,15 @@ if(!empty($_POST['export_user_fields']))
 			break;
 	}
 }
-if(!empty($_POST['export_report']) && $_POST['export_report'] == 'export_report')
-{
-	if(api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach())
-	{
+if (!empty($_POST['export_report']) && $_POST['export_report'] == 'export_report') {
+	if(api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) {
 		$user_id = null;
 		if(empty($_SESSION['export_user_fields'])) $_SESSION['export_user_fields'] = false;
-		if(!$is_allowedToEdit and !$is_tutor)
-		{
+		if(!$is_allowedToEdit and !$is_tutor) {
 			$user_id = api_get_user_id();
 		}
 		require_once('exercise_result.class.php');
-		switch($_POST['export_format'])
-		{
+		switch($_POST['export_format']) {
 			case 'xls':
 				$export = new ExerciseResult();
 				$export->exportCompleteReportXLS($documentPath, $user_id, $_SESSION['export_user_fields']);
@@ -368,51 +349,51 @@ if(!empty($_POST['export_report']) && $_POST['export_report'] == 'export_report'
 				exit;
 				break;
 		}
-	}
-	else
-	{
+	} else {
 		api_not_allowed(true);
 	}
 }
 
-if ($origin != 'learnpath')
-{
+if ($origin != 'learnpath') {
 	//so we are not in learnpath tool
 	Display::display_header($nameTools,"Exercise");
-	if(isset($_GET['message']))
-	{
-		if (in_array($_GET['message'], array('ExerciseEdited')))
-		{
+	if(isset($_GET['message'])) {
+		if (in_array($_GET['message'], array('ExerciseEdited'))) {
 			Display::display_confirmation_message(get_lang($_GET['message']));
 		}
 	}
 
-}
-else
-{
+} else {
 	echo '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'css/default.css"/>';
 }
 
+// used for stats
+include_once(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
 
-// tracking
 event_access_tool(TOOL_QUIZ);
 
-// display the introduction section
-Display::display_introduction_section(TOOL_QUIZ,'left');
+Display::display_introduction_section(TOOL_QUIZ);
 
-// Action handling
-if($is_allowedToEdit)
-{
 
-	if(!empty($choice))
-	{
+// selects $limitExPage exercises at the same time
+$from=$page*$limitExPage;
+$sql="SELECT count(id) FROM $TBL_EXERCICES";
+$res = api_sql_query($sql,__FILE__,__LINE__);
+list($nbrexerc) = Database::fetch_array($res);
+
+HotPotGCt($documentPath,1,$_user['user_id']);
+
+// only for administrator
+
+if ($is_allowedToEdit) {
+	
+	if (!empty($choice)) {
 		// construction of Exercise
+		
 		$objExerciseTmp=new Exercise();
-
-		if($objExerciseTmp->read($exerciseId))
-		{
-			switch($choice)
-			{
+		
+		if ($objExerciseTmp->read($exerciseId)) {
+			switch ($choice) {
 				case 'delete':	// deletes an exercise
 								$objExerciseTmp->delete();
 								Display::display_confirmation_message(get_lang('ExerciseDeleted'));
@@ -447,16 +428,10 @@ if($is_allowedToEdit)
 
 		// destruction of Exercise
 		unset($objExerciseTmp);
-	}
-
-	//$sql="SELECT id,title,type,active FROM $TBL_EXERCICES ORDER BY title LIMIT $from,".($limitExPage+1);
-	//$result=api_sql_query($sql,__FILE__,__LINE__);
-
+}
 
-	if(!empty($hpchoice))
-	{
-		switch($hpchoice)
-		{
+if (!empty($hpchoice)) {
+		switch($hpchoice) {
 				case 'delete':	// deletes an exercise
 					$imgparams = array();
 					$imgcount = 0;
@@ -496,36 +471,32 @@ if($is_allowedToEdit)
 				default:
 					break;
 		}
-	}
 }
 
-// the actions
-echo '<div class="actions">';
-
-	// display the next and previous link if needed
-	$from=$page*$limitExPage;
-	$sql="SELECT count(id) FROM $TBL_EXERCICES";
-	$res = api_sql_query($sql,__FILE__,__LINE__);
-	list($nbrexerc) = Database::fetch_array($res);
-	HotPotGCt($documentPath,1,$_user['user_id']);
-	// only for administrator
-	if($is_allowedToEdit)
-	{
-	if($show == 'test')
-	{
+if ($show == 'test') {
 		$sql="SELECT id,title,type,active,description, results_disabled FROM $TBL_EXERCICES WHERE active<>'-1' ORDER BY title LIMIT ".(int)$from.",".(int)($limitExPage+1);
 		$result=api_sql_query($sql,__FILE__,__LINE__);
 	}
-	}
-	// only for students
-	elseif($show == 'test')
-	{
+} elseif($show == 'test') {// only for students
 	$sql="SELECT id,title,type,description, results_disabled FROM $TBL_EXERCICES WHERE active='1' ORDER BY title LIMIT ".(int)$from.",".(int)($limitExPage+1);
 	$result=api_sql_query($sql,__FILE__,__LINE__);
+}
+
+if ($show == 'test') {
+	$nbrExercises=Database::num_rows($result);
+
+	echo '<table border="0" align="center" cellpadding="2" cellspacing="2" width="100%">'.
+		'<tr>';
+
+	if (($is_allowedToEdit) and ($origin != 'learnpath')) {
+		echo '<td width="50%" nowrap="nowrap">'.
+			'<img src="../img/new_test.gif" alt="new test" align="absbottom">&nbsp;<a href="exercise_admin.php?'.api_get_cidreq().'">'.get_lang('NewEx').'</a>'.
+			' | <img src="../img/jqz.jpg" alt="HotPotatoes" valign="ABSMIDDLE">&nbsp;<a href="hotpotatoes.php">'.get_lang('ImportHotPotatoesQuiz').'</a>'.
+			'</td>'.
+			'<td width="50%" align="right">';
+	} else {
+		echo '<td align="right">';
 	}
-	if($show == 'test')
-	{
-		$nbrExercises=Database::num_rows($result);
 
 	//get HotPotatoes files (active and inactive)
 	$res = api_sql_query ("SELECT *
@@ -541,269 +512,178 @@ echo '<div class="actions">';
 					AND ip.visibility='1'", __FILE__,__LINE__);
 	$nbrActiveTests = Database::num_rows($res);
 
-	if($is_allowedToEdit)
-	{//if user is allowed to edit, also show hidden HP tests
+	if($is_allowedToEdit) {//if user is allowed to edit, also show hidden HP tests
 		$nbrHpTests = $nbrTests;
-		}
-		else
-	{
+	} else {
 		$nbrHpTests = $nbrActiveTests;
 	}
 	$nbrNextTests = $nbrexerc-$nbrHpTests-(($page*$limitExPage));
 
 
-		echo '<span style="float:right">';
 	//show pages navigation link for previous page
-	if($page)
-	{
-			echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;page=".($page-1)."\">".Display::return_icon('previous.gif', get_lang("PreviousPage")).get_lang("PreviousPage")."</a> | ";
-	}
-	elseif($nbrExercises+$nbrNextTests > $limitExPage)
-	{
-			echo Display::return_icon('previous.gif', get_lang("PreviousPage")).get_lang('PreviousPage')." | ";
+	if($page) {
+		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&page=".($page-1)."\">&lt;&lt; ",get_lang("PreviousPage")."</a> | ";
+	} elseif($nbrExercises+$nbrNextTests > $limitExPage) {
+		echo "&lt;&lt; ",get_lang("PreviousPage")." | ";
 	}
 
 	//show pages navigation link for previous page
-	if($nbrExercises+$nbrNextTests > $limitExPage)
-	{
-			echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;page=".($page+1)."\">".get_lang("NextPage").Display::return_icon('next.gif', get_lang("NextPage"))."</a>";
+	if($nbrExercises+$nbrNextTests > $limitExPage) {
+		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&page=".($page+1)."\">&gt;&gt; ",get_lang("NextPage")."</a>";
 
-	}
-	elseif($page)
-	{
-			echo get_lang("NextPage") . Display::return_icon('next.gif', get_lang("NextPage"));
-	}
-		echo '</span>';
+	} elseif($page) {
+		echo get_lang("NextPage") . " &gt;&gt;";
 	}
 
-	if (($is_allowedToEdit) and ($origin != 'learnpath'))
-	{
-		echo '<a href="exercise_admin.php?'.api_get_cidreq().'">'.Display::return_icon('new_test.gif',get_lang('NewEx')).get_lang('NewEx').'</a>';
-		echo '<a href="hotpotatoes.php">'.Display::return_icon('jqz.jpg',get_lang('ImportHotPotatoesQuiz')).get_lang('ImportHotPotatoesQuiz').'</a>';
-		echo '<a href="'.api_add_url_param($_SERVER['REQUEST_URI'],'show=result').'">'.Display::return_icon('show_test_results.gif',get_lang("Results")).get_lang("Results").'</a>';
-
-		// the actions for the statistics
-		if($show == 'result')
-		{
-			// the form
-			if(api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach())
-			{
-				if($_SESSION['export_user_fields']==false)
-				{
-					$alt = get_lang('ExportWithUserFields');
-					$extra_user_fields = '<input type="hidden" name="export_user_fields" value="export_user_fields">';
-				}
-				else
-				{
-					$alt = get_lang('ExportWithoutUserFields');
-					$extra_user_fields =  '<input type="hidden" name="export_user_fields" value="do_not_export_user_fields">';
-				}
-				echo '<a href="#" onclick="document.form1a.submit();">'.Display::return_icon('excel.gif',get_lang('ExportAsCSV')).get_lang('ExportAsCSV').'</a>';
-				echo '<a href="#" onclick="document.form1b.submit();">'.Display::return_icon('excel.gif',get_lang('ExportAsXLS')).get_lang('ExportAsXLS').'</a>';
-				echo '<a href="#" onclick="document.form1c.submit();">'.Display::return_icon('synthese_view.gif',$alt).$alt.'</a>';			
-				echo '<a href="'.api_add_url_param($_SERVER['REQUEST_URI'],'show=test').'">'.Display::return_icon('quiz.gif', get_lang('BackToExercisesList')).get_lang('BackToExercisesList').'</a>';
-				echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
-				echo '<input type="hidden" name="export_report" value="export_report">';
-				echo '<input type="hidden" name="export_format" value="csv">';
-				echo '</form>';
-				echo '<form id="form1b" name="form1b" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
-				echo '<input type="hidden" name="export_report" value="export_report">';
-				echo '<input type="hidden" name="export_format" value="xls">';
-				echo '</form>';
-				echo '<form id="form1c" name="form1c" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
-				echo $extra_user_fields;
-				echo '</form>';
-
-			}	
-		}
-	}
-echo '</div>'; // closing the actions div
-	?>
+	echo '</td>',
+			'</tr>',
+			'</table>';
 
-<?php 
-	if($show == 'test')
-	{
 ?>
 <table class="data_table">
   <?php
-	if (($is_allowedToEdit) and ($origin != 'learnpath'))
-	{
+	if (($is_allowedToEdit) and ($origin != 'learnpath')) {
 	?>
   <tr class="row_odd">
-    <th colspan="3"><?php echo get_lang("ExerciseName");?></th>
-     <th><?php echo get_lang("Description");?></th>
+    <th colspan="3"><?php  echo get_lang('ExerciseName');?></th>
+     <th><?php echo get_lang('QuantityQuestions');?></th>
 	 <th><?php echo get_lang('Export');?></th>
-	 <th><?php echo get_lang("Modify");?></th>
+	 <th><?php echo get_lang('Modify');?></th>
 
   </tr>
   <?php
-	}
-  else
-	{
+} else {
 	 ?> <tr>
-     <th colspan="3"><?php echo get_lang("ExerciseName");?></th>
-     <th><?php echo get_lang("Description");?></th>
-	 <th><?php echo get_lang("State");?></th>
+     <th><?php echo get_lang('ExerciseName');?></th>
+     <th><?php echo get_lang('QuantityQuestions');?></th>
+	 <th><?php echo get_lang('State');?></th>
 
   </tr>
-	<?php }
-
+	<?php 
+}
 	// show message if no HP test to show
-	if(!($nbrExercises+$nbrHpTests) )
-	{
+	if (!($nbrExercises+$nbrHpTests) ) {
 	?>
   <tr>
     <td <?php echo ($is_allowedToEdit?'colspan="6"':'colspan="3"'); ?>><?php echo get_lang("NoEx"); ?></td>
   </tr>
   <?php
-	}
-
-	$i=1;
-
-	// while list exercises
-
-	if ($origin != 'learnpath') 
-	{
-  		//avoid sending empty parameters
-  		$myorigin = (empty($origin)?'':'&amp;origin='.$origin);
-  		$mylpid = (empty($learnpath_id)?'':'&amp;learnpath_id='.$learnpath_id);
-  		$mylpitemid = (empty($learnpath_item_id)?'':'&amp;learnpath_item_id='.$learnpath_item_id);
-		while($row=Database::fetch_array($result))
-		{
-
-			if($i%2==0) $s_class="row_odd"; else $s_class="row_even";
-			
-
-			// prof only
-			if($is_allowedToEdit)
-			{
-				echo '<tr class="'.$s_class.'">'."\n";
+}
+$i=1;
+// while list exercises
+
+if ($origin != 'learnpath') {
+//avoid sending empty parameters
+$myorigin = (empty($origin)?'':'&origin='.$origin);
+$mylpid = (empty($learnpath_id)?'':'&learnpath_id='.$learnpath_id);
+$mylpitemid = (empty($learnpath_item_id)?'':'&learnpath_item_id='.$learnpath_item_id);
+while($row=Database::fetch_array($result)) {
+	if($i%2==0) $s_class="row_odd"; else $s_class="row_even";
+	
+	// prof only
+	if ($is_allowedToEdit) {
+	echo '<tr class="'.$s_class.'">'."\n";
 				?>
-				<td><?php Display::display_icon('quiz.gif', get_lang('Exercice'))?></td>
+		  <td><?php Display::display_icon('quiz.gif', get_lang('Exercice'))?></td>
 				<td><?php echo ($i+($page*$limitExPage)).'.'; ?></td>
 		      <?php $row['title']=api_parse_tex($row['title']); ?>
 				<td><a href="exercice_submit.php?<?php echo api_get_cidreq().$myorigin.$mylpid.$mylpitemid; ?>&amp;exerciseId=<?php echo $row['id']; ?>" <?php if(!$row['active']) echo 'class="invisible"'; ?>><?php echo $row['title']; ?></a></td>
-			  	<td><?php
+		  <td> <?php
 		  $exid = $row['id'];
 		  $sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = '".Database::escape_string($exid)."'";
 		  $sqlresult =api_sql_query($sqlquery);
-		  $rowi = mysql_result($sqlresult,0);
+		  $rowi = Database::result($sqlresult,0);
 		  echo $rowi.' '.strtolower(get_lang(($rowi>1?'Questions':'Question'))).'</td>';
-	  		  echo '<td><a href="exercice.php?choice=exportqti2&amp;exerciseId='.$row['id'].'"><img src="../img/export.png" border="0" title="IMS/QTI" /></a></td>';
+  		  echo '<td><a href="exercice.php?choice=exportqti2&exerciseId='.$row['id'].'"><img src="../img/export.png" border="0" title="IMS/QTI" /></a></td>';
   		  ?>
-		       <td>
-		       <a href="exercise_admin.php?modifyExercise=yes&amp;exerciseId=<?php echo $row['id']; ?>"> <img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>" alt="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>" /></a>
+	       <td>
+	       <a href="exercise_admin.php?modifyExercise=yes&exerciseId=<?php echo $row['id']; ?>"> <img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>" alt="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>" /></a>
 	       <a href="admin.php?exerciseId=<?php echo $row['id']; ?>"><img src="../img/wizard_small.gif" border="0" title="<?php echo htmlentities(get_lang('Build'),ENT_QUOTES,$charset); ?>" alt="<?php echo htmlentities(get_lang('Build'),ENT_QUOTES,$charset); ?>" /></a>
-		       <a href="exercice.php?choice=delete&amp;exerciseId=<?php echo $row['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset)); echo " ".$row['title']; echo "?"; ?>')) return false;"> <img src="../img/delete.gif" border="0" alt="<?php echo htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>" /></a>
+	       <a href="exercice.php?choice=delete&exerciseId=<?php echo $row['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset)); echo " ".$row['title']; echo "?"; ?>')) return false;"> <img src="../img/delete.gif" border="0" alt="<?php echo htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>" /></a>
 	    <?php
 				// if active
-				if($row['active'])
-				{
+if ($row['active']) {
 					?>
-      				<a href="exercice.php?choice=disable&amp;page=<?php echo $page; ?>&amp;exerciseId=<?php echo $row['id']; ?>"> <img src="../img/visible.gif" border="0" alt="<?php echo htmlentities(get_lang('Deactivate'),ENT_QUOTES,$charset); ?>" /></a>
+      <a href="exercice.php?choice=disable&page=<?php echo $page; ?>&exerciseId=<?php echo $row['id']; ?>"> <img src="../img/visible.gif" border="0" alt="<?php echo htmlentities(get_lang('Deactivate'),ENT_QUOTES,$charset); ?>" /></a>
     <?php
-				}
-				// else if not active
-				else
-				{
+				} else {// else if not active
 					?>
-      				<a href="exercice.php?choice=enable&amp;page=<?php echo $page; ?>&amp;exerciseId=<?php echo $row['id']; ?>"> <img src="../img/invisible.gif" border="0" alt="<?php echo htmlentities(get_lang('Activate'),ENT_QUOTES,$charset); ?>" /></a>
+      <a href="exercice.php?choice=enable&page=<?php echo $page; ?>&exerciseId=<?php echo $row['id']; ?>"> <img src="../img/invisible.gif" border="0" alt="<?php echo htmlentities(get_lang('Activate'),ENT_QUOTES,$charset); ?>" /></a>
     <?php
-				}
-				
-				/*
-				if($row['results_disabled'])
-					echo '<a href="exercice.php?choice=enable_results&amp;page='.$page.'&amp;exerciseId='.$row['id'].'" title="'.get_lang('EnableResults').'" alt="'.get_lang('EnableResults').'"><img src="../img/lp_quiz_na.gif" border="0" alt="'.htmlentities(get_lang('EnableResults'),ENT_QUOTES,$charset).'" /></a>';
-				else
-					echo '<a href="exercice.php?choice=disable_results&amp;page='.$page.'&amp;exerciseId='.$row['id'].'" title="'.get_lang('DisableResults').'" alt="'.get_lang('DisableResults').'"><img src="../img/lp_quiz.gif" border="0" alt="'.htmlentities(get_lang('DisableResults'),ENT_QUOTES,$charset).'" /></a>';
-				*/
-				
-				echo "</td>";
-				echo "</tr>\n";
-
-			}
-			// student only
-			else
-			{
+}
+if($row['results_disabled']) {
+echo '<a href="exercice.php?choice=enable_results&page='.$page.'&exerciseId='.$row['id'].'" title="'.get_lang('EnableResults').'" alt="'.get_lang('EnableResults').'"><img src="../img/lp_quiz_na.gif" border="0" alt="'.htmlentities(get_lang('EnableResults'),ENT_QUOTES,$charset).'" /></a>';
+} else {
+echo '<a href="exercice.php?choice=disable_results&page='.$page.'&exerciseId='.$row['id'].'" title="'.get_lang('DisableResults').'" alt="'.get_lang('DisableResults').'"><img src="../img/lp_quiz.gif" border="0" alt="'.htmlentities(get_lang('DisableResults'),ENT_QUOTES,$charset).'" /></a>';
+}
+echo "</td>";
+echo "</tr>\n";
+} else {// student only
 				?>
-				<td><?php Display::display_icon('quiz.gif')?></td>
-	            <td><?php echo ($i+($page*$limitExPage)).'.'; ?></td>
+      <td><table border="0" cellpadding="0" cellspacing="0" width="100%">
+          <tr>
+            <td width="20" valign="top" align="right"><?php echo ($i+($page*$limitExPage)).'.'; ?></td>
+            <td width="1">&nbsp;</td>
             <?php $row['title']=api_parse_tex($row['title']);?>
-           		 <td><a href="exercice_submit.php?<?php echo api_get_cidreq().$myorigin.$mylpid.$myllpitemid; ?>&amp;exerciseId=<?php echo $row['id']; ?>"><?php echo $row['title']; ?></a></td>
-				 <td> <?php
-  $exid = $row['id'];
-  $sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = '".Database::escape_string($exid)."'";
-  $sqlresult =api_sql_query($sqlquery);
-  $rowi = mysql_result($sqlresult,0);
-				  echo ($rowi>1?get_lang('Questions'):get_lang('Question')); ?></td>
-
-				<td><?php
-		$eid = $row['id'];
-	$uid= api_get_user_id();
-    //this query might be improved later on by ordering by the new "tms" field rather than by exe_id
-	$qry = "select * from $TBL_TRACK_EXERCICES where exe_exo_id = '".Database::escape_string($eid)."' and exe_user_id = '".Database::escape_string($uid)."' and exe_cours_id = '".api_get_course_id()."' ORDER BY exe_id DESC";	
+            <td><a href="exercice_submit.php?<?php echo api_get_cidreq().$myorigin.$mylpid.$myllpitemid; ?>&exerciseId=<?php echo $row['id']; ?>"><?php echo $row['title']; ?></a></td>
+			</tr>
+    </table></td>
+	 <td align="center"> <?php
+$exid = $row['id'];
+$sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = '".Database::escape_string($exid)."'";
+$sqlresult =api_sql_query($sqlquery);
+$rowi = Database::result($sqlresult,0);
+echo $rowi.' '.strtolower(get_lang(($rowi>1?'Questions':'Question'))); ?> </td>
+  <td align="center"><?php
+$eid = $row['id'];
+$uid= api_get_user_id();
+//this query might be improved later on by ordering by the new "tms" field rather than by exe_id
+$qry = "SELECT * FROM $TBL_TRACK_EXERCICES " .
+		   "WHERE exe_exo_id = '".Database::escape_string($eid)."' and exe_user_id = '".Database::escape_string($uid)."' and exe_cours_id = '".api_get_course_id()."' AND session_id =  '".api_get_session_id()."' ORDER BY exe_id DESC";	
 	$qryres = api_sql_query($qry);
 	$num = Database::num_rows($qryres);
-    if($num>0)
-    {
+    if ($num>0) {
     	$row = Database::fetch_array($qryres);
     	$percentage = 0;
-    	if($row['exe_weighting'] != 0)
-    	{
+    	if($row['exe_weighting'] != 0) {
     		$percentage = ($row['exe_result']/$row['exe_weighting'])*100;
     	}
 		echo get_lang('Attempted').' ('.get_lang('Score').':';
 		printf("%1.2f\n",$percentage);
 		echo " %)";
-	}
-	else
-	{
+	} else {
 		echo get_lang('NotAttempted');
 	}
-				echo '</td>';
-			  	echo '</tr>';
-			}
-
-			// skips the last exercise, that is only used to know if we have or not to create a link "Next page"
-			if($i == $limitExPage)
-			{
+	?></td>
+  </tr>
+  <?php
+}
+// skips the last exercise, that is only used to know if we have or not to create a link "Next page"
+if($i == $limitExPage) {
 				break;
 			}
-
-			$i++;
-			
-		}	// end while()
-
+$i++;
+}	// end while()
 		$ind = $i;
-
-
-		if (($from+$limitExPage-1)>$nbrexerc)
-		{
-			if($from>$nbrexerc)
-			{
+		if (($from+$limitExPage-1)>$nbrexerc) {
+			if ($from>$nbrexerc) {
 				$from = $from - $nbrexerc;
 			  	$to = $limitExPage;
-			}
-			else
-			{
+			} else {
 				$to = $limitExPage-($nbrexerc-$from);
 				$from = 0;
 			}
-		}
-		else{
+		} else {
 			$to = $limitExPage;
 		}
 		
-		if($is_allowedToEdit)
-		{
+		if($is_allowedToEdit) {
 			$sql = "SELECT d.path as path, d.comment as comment, ip.visibility as visibility
 				FROM $TBL_DOCUMENT d, $TBL_ITEM_PROPERTY ip
 							WHERE   d.id = ip.ref AND ip.tool = '".TOOL_DOCUMENT."' AND
 							 (d.path LIKE '%htm%')
 							AND   d.path  LIKE '".Database::escape_string($uploadPath)."/%/%' LIMIT ".(int)$from.",".(int)$to; // only .htm or .html files listed
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT d.path as path, d.comment as comment, ip.visibility as visibility
 				FROM $TBL_DOCUMENT d, $TBL_ITEM_PROPERTY ip
 								WHERE d.id = ip.ref AND ip.tool = '".TOOL_DOCUMENT."' AND
@@ -813,32 +693,27 @@ echo '</div>'; // closing the actions div
 
 		$result = api_sql_query ($sql,__FILE__,__LINE__);
 		
-		while($row = Database::fetch_array($result, 'ASSOC'))
-		{
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
 			$attribute['path'      ][] = $row['path'      ];
 			$attribute['visibility'][] = $row['visibility'];
 			$attribute['comment'   ][] = $row['comment'   ];
 		}
 		$nbrActiveTests = 0;
-		if(is_array($attribute['path']))
-		{
-			while(list($key,$path) = each($attribute['path']))
-			{
+		if (is_array($attribute['path'])) {
+			while (list($key,$path) = each($attribute['path'])) {
 				list($a,$vis)=each($attribute['visibility']);
-				if (strcmp($vis,"1")==0)
-				{ $active=1;}
-				else
-				{ $active=0;}
+				if (strcmp($vis,"1")==0) { $active=1;
+				} else {
+					 $active=0;
+				}
 				echo "<tr>\n";
 
 				$title = GetQuizName($path,$documentPath);
-				if ($title =='')
-				{
+				if ($title =='') {
 					$title = GetFileName($path);
 				}
 				// prof only
-				if($is_allowedToEdit)
-				{
+				if($is_allowedToEdit) {
 					/************/
 					?>
   <td width="27%" colspan="2">
@@ -846,7 +721,7 @@ echo '</div>'; // closing the actions div
     <tr>
       <td width="30" align="left"><img src="../img/jqz.jpg" alt="HotPotatoes" /></td>
 	   <td width="15" align="center"><?php echo ($ind+($page*$limitExPage)).'.'; ?></td>
-       <td><a href="showinframes.php?file=<?php echo $path?>&amp;cid=<?php echo $_course['official_code'];?>&amp;uid=<?php echo $_user['user_id'];?>" <?php if(!$active) echo 'class="invisible"'; ?>><?php echo $title?></a></td>
+       <td><a href="showinframes.php?file=<?php echo $path?>&cid=<?php echo $_course['official_code'];?>&uid=<?php echo $_user['user_id'];?>" <?php if(!$active) echo 'class="invisible"'; ?>><?php echo $title?></a></td>
     </tr>
   </table></td>
   <td></td><td></td>
@@ -855,16 +730,12 @@ echo '</div>'; // closing the actions div
   <a href="<?php echo $exercicePath; ?>?hpchoice=delete&amp;file=<?php echo $path; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('AreYouSure'),ENT_QUOTES,$charset).$title."?"); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="<?php echo htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>" /></a>
     <?php
 					// if active
-					if($active)
-					{
+					if($active){
 						$nbrActiveTests = $nbrActiveTests + 1;
 						?>
       <a href="<?php echo $exercicePath; ?>?hpchoice=disable&amp;page=<?php echo $page; ?>&amp;file=<?php echo $path; ?>"><img src="../img/visible.gif" border="0" alt="<?php echo htmlentities(get_lang('Deactivate'),ENT_QUOTES,$charset); ?>" /></a>
     <?php
-					}
-					// else if not active
-					else
-					{
+					} else {// else if not active
 						?>
     <a href="<?php echo $exercicePath; ?>?hpchoice=enable&amp;page=<?php echo $page; ?>&amp;file=<?php echo $path; ?>"><img src="../img/invisible.gif" border="0" alt="<?php echo htmlentities(get_lang('Activate'),ENT_QUOTES,$charset); ?>" /></a>
     <?php
@@ -872,12 +743,8 @@ echo '</div>'; // closing the actions div
 					echo '<img src="../img/lp_quiz_na.gif" border="0" alt="" />';
 				/****************/
 				?></td>
-      <?php }
-				// student only
-				else
-				{
-					if ($active==1)
-					{
+      <?php } else {// student only
+					if ($active==1) {
 						$nbrActiveTests = $nbrActiveTests + 1;
 						?>
     <td width="40%"><table border="0" cellpadding="0" cellspacing="0" width="100%">
@@ -894,18 +761,13 @@ echo '</div>'; // closing the actions div
 				}
 				?>
   <?php
-				if($ind == $limitExPage)
-				{
+				if ($ind == $limitExPage) {
 					break;
 				}
-				if($is_allowedToEdit)
-				{
+				if ($is_allowedToEdit) {
 					$ind++;
-				}
-				else
-				{
-					if ($active==1)
-					{
+				} else {
+					if ($active==1) {
 						$ind++;
 					}
 				}
@@ -917,123 +779,182 @@ echo '</div>'; // closing the actions div
 	?>
 </table>
 <?php
-}
+} else {
+	if ($origin != 'learnpath') {
+		echo '<a href="'.api_add_url_param($_SERVER['REQUEST_URI'],'show=test').'">&lt;&lt; '.get_lang('Back').'</a>';
+	}
+}// end if($show == 'test')
 
 /*****************************************/
 /* Exercise Results (uses tracking tool) */
 /*****************************************/
 
 // if tracking is enabled
-if($_configuration['tracking_enabled'])
-{
-
-	if($show == 'result')
-	{
-		?>
-		
-				<table class="data_table">
-				 <tr class="row_odd">
-				  <?php if($is_allowedToEdit || $is_tutor): ?>
-		           <th><?php echo get_lang("User"); ?></th><?php endif; ?>
-		           <th><?php echo get_lang("Exercice"); ?></th>
-                   <th><?php echo get_lang("Description"); ?></th>
-		           <th><?php echo get_lang("Date"); ?></th>
-				  <th><?php echo get_lang("Result"); ?></th>
-				  <th><?php echo (($is_allowedToEdit||$is_tutor)?get_lang("CorrectTest"):get_lang("ViewTest")); ?></th>
+if ($_configuration['tracking_enabled']) {
+
+	if ($show == 'result') {
+
+		if (!function_exists('make_select')) {
+			function make_select($name,$values,$checked=''){
+				$output .= '<select name="'.$name.'" >';
+ 				foreach($values as $key => $value) {
+ 					$output .= '<option value="'.$key.'" '.(($checked==$key)?'selected="selected"':'').'>'.$value.'</option>';
+ 				}
+ 					$output .= '</select>';	
+ 				return $output;
+			}
+		}
+	
+	if (api_is_allowed_to_edit()) { 
+		if (!$_REQUEST['filter']) {
+			$filter_by_not_revised = true;		
+			$filter=1;	
+		}
+		$filter = (int)$_REQUEST['filter']; 
 		
 		
+		switch($filter){
+		 case 1: 
+				$filter_by_not_revised = true;
+				break;
+	 	 case 2:  
+				$filter_by_revised = true;
+				break;
+		 default:
+		 		null;
+		}
+		$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.api_get_course_id().'&show=result">';
+		$form_filter .= make_select('filter',array(1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised')),$filter);
+		$form_filter .= '<input type="submit" value="'.get_lang('FilterExercices').'"> </form>';
+		echo $form_filter;
+	} 
+
+		// the form
+		if(api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) {
+			
+			echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
+			echo '<input type="hidden" name="export_report" value="export_report">';
+			echo '<input type="hidden" name="export_format" value="csv">';
+			echo '</form>';
+			echo '<form id="form1b" name="form1b" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
+			echo '<input type="hidden" name="export_report" value="export_report">';
+			echo '<input type="hidden" name="export_format" value="xls">';
+			echo '</form>';
+			echo '<form id="form1c" name="form1c" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
+			if($_SESSION['export_user_fields']==false) {
+				$alt = get_lang('ExportWithUserFields');
+				echo '<input type="hidden" name="export_user_fields" value="export_user_fields">';
+			} else {
+				$alt = get_lang('ExportWithoutUserFields');
+				echo '<input type="hidden" name="export_user_fields" value="do_not_export_user_fields">';
+			}
+			echo '</form>';
+			echo '<a class="quiz_export_link" href="#" onclick="document.form1a.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif" alt="'.get_lang('ExportAsCSV').'">&nbsp;'.get_lang('ExportAsCSV').'</a>';
+			echo '<a class="quiz_export_link" href="#" onclick="document.form1b.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif" alt="'.get_lang('ExportAsXLS').'">&nbsp;'.get_lang('ExportAsXLS').'</a>';
+			echo '<a class="quiz_export_link" href="#" onclick="document.form1c.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'synthese_view.gif" alt="'.$alt.'">&nbsp;'.$alt.'</a>';
+			echo '<br /><br />';		
+		}
+		?>
+		<table class="data_table">
+		 <tr class="row_odd">
+		  <?php if($is_allowedToEdit || $is_tutor): ?>
+		  <th><?php  echo get_lang('User'); ?></th><?php endif; ?>
+		  <th><?php echo get_lang('Exercice'); ?></th>
+		  <th><?php echo get_lang('Duration'); ?></th>
+		  <th><?php echo get_lang('Date'); ?></th>
+		  <th><?php echo get_lang('Result'); ?></th>
+		  <th><?php echo (($is_allowedToEdit||$is_tutor)?get_lang("CorrectTest"):get_lang("ViewTest")); ?></th>
 		 </tr>
-
 		<?php
-					
-		if($is_allowedToEdit)
-				{
-					//get all results (ourself and the others) as an admin should see them
-					//AND exe_user_id <> $_user['user_id']  clause has been removed
-					$sql="SELECT CONCAT(lastname,' ',firstname),ce.title, te.exe_result ,
-								te.exe_weighting, UNIX_TIMESTAMP(te.exe_date),te.exe_Id,email, UNIX_TIMESTAMP(te.start_date),steps_counter
-						  FROM $TBL_EXERCICES AS ce , $TBL_TRACK_EXERCICES AS te, $TBL_USER AS user
-						  WHERE te.exe_exo_id = ce.id AND  te.status != 'incomplete' AND user_id=te.exe_user_id AND te.exe_cours_id='$_cid' ";
-
-
-					switch ($_GET['column']) {
-		    			case 'username':
-							$sql .= ' order by lastname '.$ordering.', firstname ASC, ce.title ASC, te.exe_date ASC';
-							break;
-		    			case 'exercisename':
-							$sql .= ' order by ce.title '.$ordering.', te.exe_date ASC, lastname ASC, firstname ASC';
-		        			break;
-		    			case 'date':
-	        				$sql .= ' order by te.exe_date '.$ordering.',ce.title ASC, lastname ASC, firstname ASC';
-							break;
-						case '':
-							$sql .= ' ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC';
-							break;
-					}
-					$hpsql="SELECT CONCAT(tu.lastname,' ',tu.firstname), tth.exe_name,
-								tth.exe_result , tth.exe_weighting, UNIX_TIMESTAMP(tth.exe_date)
-							FROM $TBL_TRACK_HOTPOTATOES tth, $TBL_USER tu
-							WHERE  tu.user_id=tth.exe_user_id AND tth.exe_cours_id = '".$_cid."'";
-					switch ($_GET['column']) {
-		    			case 'username':
-	        				$hpsql .= ' order by tu.lastname '.$ordering.', tu.firstname ASC,tth.exe_date ASC,tth.exe_name ASC';
-							break;
-		    			case 'exercisename':
-	        				$hpsql .= ' order by tth.exe_name '.$ordering.', tth.exe_date ASC, tu.lastname ASC, tu.firstname ASC';
-		        			break;
-		    			case 'date':
-	        				$hpsql .= ' order by tth.exe_date '.$ordering.',tth.exe_name ASC, tu.lastname ASC, tu.firstname ASC';
-							break;
-						case '':
-							$hpsql .= ' ORDER BY tth.exe_cours_id ASC, tth.exe_date ASC';
-							break;
-					}
-				}
-				else
-				{// get only this user's results
-					$_uid = api_get_user_id();
-					$sql="SELECT '',ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date),te.exe_id
-						  FROM $TBL_EXERCICES AS ce , $TBL_TRACK_EXERCICES AS te
-						  WHERE te.exe_exo_id = ce.id AND te.exe_user_id='".$_uid."'AND te.status != 'incomplete' AND te.exe_cours_id='$_cid'";
-					switch ($_GET['column']) {
-		    			case 'exercisename':
-	        				$sql .= " order by ce.title $ordering, te.exe_date ASC";
-		        			break;
-		    			case 'date':
-	        				$sql .= " order by te.exe_date $ordering,ce.title ASC";
-							break;
-						case '':
-							$sql .= " ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
-							break;
-					}
-					$hpsql="SELECT '',exe_name, exe_result , exe_weighting, UNIX_TIMESTAMP(exe_date)
-							FROM $TBL_TRACK_HOTPOTATOES
-							WHERE exe_user_id = '".$_uid."' AND exe_cours_id = '".$_cid."'";
-					switch ($_GET['column']) {
-		    			case 'exercisename':
-	        				$hpsql .= " order by exe_name $ordering, exe_date ASC";
-		        			break;
-		    			case 'date':
-	        				$hpsql .= " order by exe_date $ordering,exe_name ASC";
-							break;
-						case '':
-							$hpsql .= " ORDER BY exe_cours_id ASC, exe_date ASC";
-							break;
-					}
+		$session_id_and='';
+		if (api_get_session_id()!=0) {
+			$session_id_and = ' AND session_id = ' .api_get_session_id().' ';
+		}
+			
+		if($is_allowedToEdit || $is_tutor) {
+			$user_id_and='';
+			
+			if (!empty($_POST['filter_by_user'])) {
+				$user_id_and = ' AND user_id = ' . Database::escape_string ( (int)$_POST['filter_by_user'] ).' ';
+			}
+			
+			if($_GET['gradebook']=='view') {
+				$exercise_where_query = 'te.exe_exo_id =ce.id AND ';
+			}
+			
+			$sql="SELECT CONCAT(lastname,' ',firstname), ce.title, te.exe_result ,
+						 te.exe_weighting, UNIX_TIMESTAMP(te.exe_date), te.exe_id, email,UNIX_TIMESTAMP(ce.start_time),steps_counter,user_id
+				  FROM $TBL_EXERCICES AS ce , $TBL_TRACK_EXERCICES AS te, $TBL_USER AS user
+				  WHERE  te.exe_exo_id = ce.id AND te.status != 'incomplete' AND user_id=te.exe_user_id AND te.exe_cours_id='".Database::escape_string($_cid)."'
+				  AND user.status<>1 $user_id_and $session_id_and AND ce.active <>-1
+				  ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date DESC";
+	
 
+			$hpsql="SELECT CONCAT(tu.lastname,' ',tu.firstname), tth.exe_name,
+						tth.exe_result , tth.exe_weighting, UNIX_TIMESTAMP(tth.exe_date)
+					FROM $TBL_TRACK_HOTPOTATOES tth, $TBL_USER tu
+					WHERE  tu.user_id=tth.exe_user_id AND tth.exe_cours_id = '".Database::escape_string($_cid)." $user_id_and '
+					ORDER BY tth.exe_cours_id ASC, tth.exe_date DESC";
+			} else { 
+				// get only this user's results
+				$user_id_and = ' AND te.exe_user_id = ' . Database::escape_string ( api_get_user_id() ).' ';
+				 
+				$sql="SELECT CONCAT(lastname,' ',firstname),ce.title, te.exe_result ,
+						te.exe_weighting, UNIX_TIMESTAMP(te.exe_date),te.exe_id,email,UNIX_TIMESTAMP(ce.start_time),steps_counter,user_id 
+				  FROM $TBL_EXERCICES AS ce , $TBL_TRACK_EXERCICES AS te, $TBL_USER AS user 
+				  WHERE  te.exe_exo_id = ce.id AND te.status != 'incomplete' AND user_id=te.exe_user_id AND te.exe_cours_id='".Database::escape_string($_cid)."'
+				  AND user.status<>1 $user_id_and  $session_id_and AND ce.active <>-1
+				  ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date DESC";
+
+				$hpsql="SELECT '',exe_name, exe_result , exe_weighting, UNIX_TIMESTAMP(exe_date)
+					FROM $TBL_TRACK_HOTPOTATOES
+					WHERE exe_user_id = '".$_user['user_id']."' AND exe_cours_id = '".Database::escape_string($_cid)."'
+					ORDER BY exe_cours_id ASC, exe_date DESC";
+					//error_log($hpsql);
+			
 		}
-		$results=getManyResultsXCol($sql,9);
+		
+		$results=getManyResultsXCol($sql,10);
 		$hpresults=getManyResultsXCol($hpsql,5);
 
 		$NoTestRes = 0;
 		$NoHPTestRes = 0;
 		//Print the results of tests
 		$lang_nostartdate = get_lang('NoStartDate').' / ';
-		if(is_array($results))
-		{
+		if (is_array($results)) {
+			$users_array_id = array();
+			if ($_GET['gradebook']=='view') {
+				$filter_by_no_revised = true;
+				$from_gradebook = true;
+			}
 			$sizeof = sizeof($results);
-			for($i = 0; $i < $sizeof; $i++)
-			{
+			$user_list_name = $user_list_id = array();
+			
+			for ($i = 0; $i < $sizeof; $i++) {
+						
+				$revised = false;
+				$sql_exe='SELECT exe_id FROM '.Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING).' WHERE author != '."''".' AND exe_id = '."'".$results[$i][5]."'".' LIMIT 1';				
+				$query = api_sql_query($sql_exe,__FILE__,__LINE__);
+
+				if ( Database::num_rows($query) > 0) {
+					$revised = true;	
+				}
+				if ($filter_by_not_revised && $revised == true) {
+					continue;
+				}
+				if($filter_by_revised && $revised == false) {
+					continue;	
+				}					
+				if($from_gradebook && ($is_allowedToEdit || $is_tutor)) {
+					if(in_array($results[$i][1].$results[$i][0],$users_array_id)) {
+						continue;						
+					}
+					$users_array_id[] = $results[$i][1].$results[$i][0];					
+				}
+				
+				$user_list_name[] =  $results[$i][0];
+				$user_list_id[] =  $results[$i][9];
+		
 				$id = $results[$i][5];
 				$mailid = $results[$i][6];
 				$user = $results[$i][0];
@@ -1041,57 +962,54 @@ if($_configuration['tracking_enabled'])
 				$dt = strftime($dateTimeFormatLong,$results[$i][4]);
 				$res = $results[$i][2];
 				echo '<tr';
-				if($i%2==0) echo 'class="row_odd"'; else echo 'class="row_even"';
+				if ($i%2==0) {
+					echo 'class="row_odd"'; 
+				} else {
+					echo 'class="row_even"';
+				}	
 				echo '>';
-				
 				$add_start_date = $lang_nostartdate;
-				if($is_allowedToEdit || $is_tutor)
-				{
+				if ($is_allowedToEdit || $is_tutor) {
 					$user = $results[$i][0];
-					echo '<td>'.$user.' '.$duration.'</td>';
-					echo '<td>';
-					if($results[$i][7] > 1){
-						echo ceil((($results[$i][4] - $results[$i][7])/60)).' '.get_lang('Min');
-						if($results[$i][8] > 1)echo ' ( '.$results[$i][8].' '.get_lang('Steps').' )';
-						$add_start_date = format_locale_date('%b %d, %Y %H:%M',$results[$i][7]).' / ';
-					} else {
-						echo get_lang('NoLogOfDuration');
-					}
-					
-					echo '</td>';
+					echo '<td>'.$user.' '.$duration.'</td>';					
 				}
-
 				echo '<td>'.$test.'</td>';
+				echo '<td>';
+				if ($results[$i][7] > 1) {
+					echo ceil((($results[$i][4] - $results[$i][7])/60)).' '.get_lang('Min');
+					if($results[$i][8] > 1) {
+						echo ' ( '.$results[$i][8].' '.get_lang('Steps').' )';
+					}
+					$add_start_date = format_locale_date('%b %d, %Y %H:%M',$results[$i][7]).' / ';
+				} else {
+					echo get_lang('NoLogOfDuration');
+				}
+				
+				echo '</td>';
+								
 				echo '<td>'.$add_start_date.format_locale_date('%b %d, %Y %H:%M',$results[$i][4]).'</td>';//get_lang('dateTimeFormatLong')
 		  		echo '<td>'.round(($res/($results[$i][3]!=0?$results[$i][3]:1))*100).'% ('.$res.' / '.$results[$i][3].')</td>';
-				
-				echo '<td>'.
-				(($is_allowedToEdit||$is_tutor)?
-				"<a href='exercise_show.php?user=$user&dt=$dt&res=$res&id=$id&email=$mailid'>".get_lang('Edit').'</a>'.' - '.'<a href="exercice.php?cidReq='.htmlentities($_GET['cidReq']).'&show=result&delete=delete&did='.$id.'" onclick="javascript:if(!confirm(\''.sprintf(get_lang('DeleteAttempt'),$user,$dt).'\')) return false;">'.get_lang('Delete').'</a>'
-				.' - <a href="exercice_history.php?cidReq='.htmlentities($_GET['cidReq']).'&exe_id='.$id.'">'.get_lang('ViewScoreChangeHistory').'</a>'
-				:
-				"<a href='exercise_show.php?dt=$dt&res=$res&id=$id'>".get_lang('Show').'</a>').'</td>';
+				echo '<td>'.(($is_allowedToEdit||$is_tutor)?
+							"<a href='exercise_show.php?user=$user&dt=$dt&res=$res&id=$id&email=$mailid'>".
+							(($revised)?get_lang('Edit'):get_lang('Qualify'))."</a>".
+							((api_is_platform_admin() || $is_tutor)?' - <a href="exercice.php?cidReq='.htmlentities($_GET['cidReq']).'&show=result&filter='.$filter.'&delete=delete&did='.$id.'" onclick="javascript:if(!confirm(\''.sprintf(get_lang('DeleteAttempt'),$user,$dt).'\')) return false;">'.get_lang('Delete').'</a>':'')
+							.(($is_allowedToEdit)?' - <a href="exercice_history.php?cidReq='.htmlentities($_GET['cidReq']).'&exe_id='.$id.'">'.get_lang('ViewHistory').'</a>':'')
+							:(($revised)?"<a href='exercise_show.php?dt=$dt&res=$res&id=$id'>".get_lang('Show')."</a>":'')).'</td>';
 				echo '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 				$NoTestRes = 1;
 		}
+
 		// Print the Result of Hotpotatoes Tests
-		if(is_array($hpresults))
-		{
-			$sizeof = sizeof($hpresults);
-			for($i = 0; $i < $sizeof; $i++)
-			{
+		if (is_array($hpresults)) {
+			for($i = 0; $i < sizeof($hpresults); $i++) {
 				$title = GetQuizName($hpresults[$i][1],$documentPath);
-				if ($title =='')
-				{
+				if ($title =='') {
 					$title = GetFileName($hpresults[$i][1]);
 				}
 				echo '<tr>';
-				if($is_allowedToEdit)
-				{
+				if ($is_allowedToEdit) {
 					echo '<td class="content">'.$hpresults[$i][0].'</td>';
 				}
 				echo '<td class="content">'.$title.'</td>';
@@ -1100,40 +1018,53 @@ if($_configuration['tracking_enabled'])
 				echo '<td></td>'; //there is no possibility to edit the results of a Hotpotatoes test
 				echo '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			$NoHPTestRes = 1;
 		}
-
-
-
-		if ($NoTestRes==1 && $NoHPTestRes==1)
-		{
-		?>
-
-		 <tr>
-		  <td colspan="6"><?php echo get_lang("NoResult"); ?></td>
-		 </tr>
-
-		<?php
+		
+		if ($NoTestRes==1 && $NoHPTestRes==1) {
+			?>
+			 <tr>
+			  <td colspan="6"><?php echo get_lang("NoResult"); ?></td>
+			 </tr>
+			<?php
 		}
-
 		?>
-
 		</table>
-
+		<br />
 		<?php
-	}
+		if (api_is_allowed_to_edit()) { 
+			$user_count = count($user_list_name);
+			if ($user_count >0 ) {			
+				$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.api_get_course_id().'&show=result">';		
+				$user_list_for_select =array();
+				for ($i=0;$i<$user_count;$i++) {
+					$user_list_for_select[$user_list_id[$i]]=$user_list_name[$i];
+				}
+				$form_filter .= make_select('filter_by_user',$user_list_for_select,(int)$_REQUEST['filter_by_user']);
+				$form_filter .= '<input type="hidden" name="filter" value="'.$filter.'">';		
+				$form_filter .= '<input type="submit" value="'.get_lang('FilterExercicesByUsers').'"></form>';
+				echo $form_filter;
+			}		
+		}
+		} else {
+			echo '<p><img src="'.api_get_path(WEB_IMG_PATH).'show_test_results.gif" align="absbottom">&nbsp;<a href="'.api_add_url_param($_SERVER['REQUEST_URI'],'show=result').'">'.get_lang("Results").' &gt;&gt;</a></p>';
+	
+		}
+	// end if($show == 'result')
+	
+
 }// end if tracking is enabled
 
+	
+		
+		
+
 if ($origin != 'learnpath') { //so we are not in learnpath tool
 	Display::display_footer();
-} 
-else 
-{
+} else {
 	?>
 	<link rel="stylesheet" type="text/css" href="<?php echo $clarolineRepositoryWeb ?>css/default.css" />
 	<?php
 }
-?>
+?>
\ No newline at end of file
diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php
index 9c438fa0f7..d759d1d838 100644
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
@@ -1,4 +1,4 @@
-<?php // $Id: exercice_submit.php 16726 2008-11-12 15:44:48Z pcool $
+<?php // $Id: exercice_submit.php 17277 2008-12-14 02:26:03Z cfasanando $
  
 /*
 ==============================================================================
@@ -42,7 +42,7 @@
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
 * 	@author Julio Montoya multiple fill in blank option added
-* 	@version $Id: exercice_submit.php 16726 2008-11-12 15:44:48Z pcool $
+* 	@version $Id: exercice_submit.php 17277 2008-12-14 02:26:03Z cfasanando $
 */
 
 
@@ -137,8 +137,7 @@ if($buttonCancel)
 	exit();
 }
 
-if ($origin=='builder') 
-{
+if ($origin=='builder') {
 	/*******************************/
 	/* Clears the exercise session */
 	/*******************************/
@@ -151,93 +150,86 @@ if ($origin=='builder')
 }
 
 $condition = ' WHERE ' .
-		'exe_exo_id =   '."'".$exerciseId."'".' AND ' .
-		'exe_user_id =  '."'".api_get_user_id()."'".' AND ' .
+		'exe_exo_id = '."'".$exerciseId."'".' AND ' .
+		'exe_user_id = '."'".api_get_user_id()."'".' AND ' .
 		'exe_cours_id = '."'".$_course['id']."'".' AND ' .
 		'status = '."'incomplete'".' AND '.
-		'session_id =   '."'".api_get_session_id()."'";
+		'session_id = '."'".(int)$_SESSION['id_session']."'";
 
-if(empty($exerciseType)){
+if (empty($exerciseType)) {
 	$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
 	$result=api_sql_query("SELECT type FROM $TBL_EXERCICES WHERE id='$exerciseId'",__FILE__,__LINE__);
-	$exercise_row = mysql_fetch_array($result);
+	$exercise_row = Database::fetch_array($result);
 	$exerciseType = $exercise_row['type'];
 }
 
-//search for a 'incomplete' exercise of this user for this exercise for this course and session
-//if exist, try to build and array of answers from the track_e_attempt
-// and load the question list saved too.
-if($_configuration['live_exercise_tracking'] == true){
+if ($exerciseType == 1) {
+	$_SESSION['exercice_start_date'] = date('Y-m-d H:i:s');
+}
+
+if ($_configuration['live_exercise_tracking'] == true && $exerciseType == 2) {
 	$sql = api_sql_query('SELECT * FROM '.$stat_table.$condition,__FILE__,__LINE__);
-	// if exist log of entry to this exercise 
-	if(mysql_num_rows($sql) > 0 ){
-		if($exerciseType == 2){
-			$getIncomplete = mysql_fetch_array($sql);
-			$exe_id = $getIncomplete['exe_id'];
-			
-			if($_SERVER['REQUEST_METHOD']!='POST'){
-				define('QUESTION_LIST_ALREADY_LOGGED',1);
-				api_sql_query('UPDATE '.$stat_table.' SET steps_counter = steps_counter + 1 WHERE exe_id = '.$exe_id,__FILE__,__LINE__);
-				$recorded['questionList'] = explode(',',$getIncomplete['data_tracking']);
-
-				$sql = api_sql_query('SELECT * FROM '.$exercice_attemp_table.' WHERE exe_id = '.$getIncomplete['exe_id'].' ORDER BY tms ASC',__FILE__,__LINE__);
-				while($row = mysql_fetch_array($sql)){
-					$recorded['exerciseResult'][$row['question_id']] = 1;
-				}
-				$_SESSION['exerciseResult'] = $recorded['exerciseResult'];
-				$exerciseType = 2;
-				$questionNum = count($recorded['exerciseResult']);
-				$questionNum++;
-				//$questionNum = $questionList[$questionNum];
-				$questionList = $_SESSION['questionList'] = array_combine(range(1,count($recorded['questionList'])),$recorded['questionList']);
+	if(Database::num_rows($sql) > 0 ){
+		
+		$getIncomplete = Database::fetch_array($sql);
+		$exe_id = $getIncomplete['exe_id'];
+		if ($_SERVER['REQUEST_METHOD']!='POST') {
+			define('QUESTION_LIST_ALREADY_LOGGED',1);
+			$recorded['questionList'] = explode(',',$getIncomplete['data_tracking']);
+			$sql = api_sql_query('SELECT * FROM '.$exercice_attemp_table.' WHERE exe_id = '.$getIncomplete['exe_id'].' ORDER BY tms ASC',__FILE__,__LINE__);
+			while ($row = Database::fetch_array($sql)) {
+				$recorded['exerciseResult'][$row['question_id']] = 1;
+		
 			}
+			$exerciseResult = $_SESSION['exerciseResult'] = $recorded['exerciseResult'];
+			$exerciseType = 2;
+			$questionNum = count($recorded['exerciseResult']);
+			$questionNum++;
+			$questionList = $_SESSION['questionList'] = $recorded['questionList'];
 		}
-	}else{
+	} 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 ($formSent) {
+    if ($debug>0) {
+    	echo str_repeat('&nbsp;',0).'$formSent was set'."<br />\n";
+    }
 
     // initializing
-    if(!is_array($exerciseResult))
-    {
+    if (!is_array($exerciseResult)) {
         $exerciseResult=array();
         $exerciseResultCoordinates=array();
     }
+    
 
     // 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 (is_array($choice)) {
+        if ($debug>0) {
+        	echo str_repeat('&nbsp;',0).'$choice is an array'."<br />\n";
+        }
 
-        if($exerciseType == 1)
-        {
+        if ($exerciseType == 1) {
             // $exerciseResult receives the content of the form.
             // Each choice of the student is stored into the array $choice
             $exerciseResult=$choice;
 
-            if (isset($_POST['hotspot']))
-            {
+            if (isset($_POST['hotspot'])) {
             	$exerciseResultCoordinates = $_POST['hotspot'];
             }
-        }
-        else
-        {
+        } 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]))
-            {
+            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 == 2):
+                if ($_configuration['live_exercise_tracking'] == true && $exerciseType == 2):
 					$nro_question = $questionNum;// - 1; 
 //START of saving and qualifying each question submitted
 //------------------------------------------------------------------------------------------
@@ -250,8 +242,7 @@ if($formSent)
 	$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)
-	{
+	if (true) {
 		$exeId = $exe_id;
 		$questionId = $key;
 		$counter++;
@@ -277,23 +268,22 @@ if($formSent)
 		$objAnswerTmp=new Answer($questionId);
 		$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
 		$questionScore=0;
-		if($answerType == FREE_ANSWER)
+		if ($answerType == FREE_ANSWER) {
 			$nbrAnswers = 1;
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
-		{
+		}
+			
+		for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
 			$answer=$objAnswerTmp->selectAnswer($answerId);
 			$answerComment=$objAnswerTmp->selectComment($answerId);
 			$answerCorrect=$objAnswerTmp->isCorrect($answerId);
 			$answerWeighting=$objAnswerTmp->selectWeighting($answerId);
 
-			switch($answerType)
-			{
+			switch ($answerType) {
 				// for unique answer
 				case UNIQUE_ANSWER :
 										$studentChoice=($choice == $answerId)?1:0;
 
-										if($studentChoice)
-										{
+										if ($studentChoice) {
 										  	$questionScore+=$answerWeighting;
 											$totalScore+=$answerWeighting;
 										}
@@ -305,8 +295,7 @@ if($formSent)
 
 										$studentChoice=$choice[$answerId];
 
-										if($studentChoice)
-										{
+										if ($studentChoice) {
 											$questionScore+=$answerWeighting;
 											$totalScore+=$answerWeighting;
 										}
@@ -329,14 +318,12 @@ if($formSent)
 										$is_set_switchable = explode('@', $pre_array[$last]);
 										
 										$switchable_answer_set=false;
-										if (isset($is_set_switchable[1]) && $is_set_switchable[1]==1)
-										{
+										if (isset($is_set_switchable[1]) && $is_set_switchable[1]==1) {
 											$switchable_answer_set=true;
 										}								
 										
                                         $answer = '';
-                                        for ($k=0; $k<$last; $k++)
-                                        {
+                                        for ($k=0; $k<$last; $k++) {
 										  $answer .= $pre_array[$k];
                                         }
 										
@@ -351,8 +338,7 @@ if($formSent)
 										$startlocations=strpos($temp,'[tex]');
 										$endlocations=strpos($temp,'[/tex]');
 
-										if($startlocations !== false && $endlocations !== false)
-										{
+										if ($startlocations !== false && $endlocations !== false) {
 											$texstring=substr($temp,$startlocations,$endlocations-$startlocations+6);
 											// 2. replace this by {texcode}
 											$temp=str_replace($texstring,'{texcode}',$temp);
@@ -366,11 +352,9 @@ if($formSent)
 										$correct_tags=array();
 										$real_text=array();
 										// the loop will stop at the end of the text
-										while(1)
-										{
+										while (1) {
 											// quits the loop if there are no more blanks (detect '[')
-											if(($pos = strpos($temp,'[')) === false)
-											{
+											if (($pos = strpos($temp,'[')) === false) {
 												// adds the end of the text
 												$answer=$temp;
 												// TeX parsing - replacement of texcode tags
@@ -386,8 +370,7 @@ if($formSent)
 											//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)
-											{
+											if (($pos = strpos($temp,']')) === false) {
 												// adds the end of the text
 												$answer.=$temp;
 												break;
@@ -405,17 +388,13 @@ if($formSent)
 										$real_correct_tags = $correct_tags;							
 										$chosen_list=array();
 
-										for($i=0;$i<count($real_correct_tags);$i++)
-										{
-											if ($i==0)
-											{
+										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])
-												{
+											if (!$switchable_answer_set) {						
+												if ($correct_tags[$i]==$user_tags[$i]) {
 													// gives the related weighting to the student
 													$questionScore+=$answerWeighting[$i]; 
 													// increments total score
@@ -424,21 +403,16 @@ if($formSent)
 													$answer.=stripslashes($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]))
-												{
+												elseif(!empty($user_tags[$i])) {
 													// adds the word in red at the end of the string, and strikes it
 													$answer.='<font color="red"><s>'.stripslashes($user_tags[$i]).'</s></font>'; 
-												}
-												else
-												{
+												} 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))
-												{
+											} 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);
 																	
@@ -448,14 +422,11 @@ if($formSent)
 													$totalScore+=$answerWeighting[$i];
 													// adds the word in green at the end of the string
 													$answer.=stripslashes($user_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]))
-												{
+												} 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>'.stripslashes($user_tags[$i]).'</s></font>'; 
-												}
-												else
-												{
+												} else {
 													// adds a tabulation if no word has been typed by the student
 													$answer.='&nbsp;&nbsp;&nbsp;';
 												}												
@@ -472,63 +443,46 @@ if($formSent)
 				case FREE_ANSWER :
 										$studentChoice=$choice;
 
-										if($studentChoice)
-										{
+										if ($studentChoice) {
 											//Score is at -1 because the question has'nt been corected
 										  	$questionScore=-1;
 											$totalScore+=0;
 										}
-
-
 										break;
 				// for matching
 				case MATCHING :
-										if($answerCorrect)
-										{
-											if($answerCorrect == $choice[$answerId])
-											{
+										if ($answerCorrect) {
+											if ($answerCorrect == $choice[$answerId]) {
 												$questionScore+=$answerWeighting;
 												$totalScore+=$answerWeighting;
 												$choice[$answerId]=$matching[$choice[$answerId]];
-											}
-											elseif(!$choice[$answerId])
-											{
+											} elseif(!$choice[$answerId]) {
 												$choice[$answerId]='&nbsp;&nbsp;&nbsp;';
-											}
-											else
-											{
+											} else {
 												$choice[$answerId]='<font color="red"><s>'.$matching[$choice[$answerId]].'</s></font>';
 											}
-										}
-										else
-										{
+										} else {
 											$matching[$answerId]=$answer;
 										}
 										break;
 				// for hotspot with no order
 				case HOT_SPOT :			$studentChoice=$choice[$answerId];
 
-										if($studentChoice)
-										{
+										if($studentChoice) {
 											$questionScore+=$answerWeighting;
 											$totalScore+=$answerWeighting;
 										}
-
 										break;
 				// for hotspot with fixed order
 				case HOT_SPOT_ORDER :	$studentChoice=$choice['order'][$answerId];
 
-										if($studentChoice == $answerId)
-										{
+										if ($studentChoice == $answerId) {
 											$questionScore+=$answerWeighting;
 											$totalScore+=$answerWeighting;
 											$studentChoice = true;
-										}
-										else
-										{
+										} else {
 											$studentChoice = false;
 										}
-
 										break;
 			} // end switch Answertype
 		} // end for that loops over all answers of the current question
@@ -540,37 +494,29 @@ if($formSent)
 
 		$totalWeighting+=$questionWeighting;
 		//added by priya saini
-		if($_configuration['tracking_enabled'])
-		{
-			if(empty($choice)){
+		if ($_configuration['tracking_enabled']) {
+			if (empty($choice)) {
 				$choice = 0;
 			}
-			if ($answerType==MULTIPLE_ANSWER )
-			{				
-				if ($choice != 0)
-				{
+			if ($answerType==MULTIPLE_ANSWER ) {				
+				if ($choice != 0) {
 					$reply = array_keys($choice);
 							
-					for ($i=0;$i<sizeof($reply);$i++)
-					{
+					for ($i=0;$i<sizeof($reply);$i++) {
 						$ans = $reply[$i];
 						exercise_attempt($questionScore,$ans,$quesId,$exeId,$i);
 					}
-				}
-				else
-				{
+				} else {
 					exercise_attempt($questionScore, 0 ,$quesId,$exeId,0);
 				}
-			}
-			elseif ($answerType==MATCHING)
-			{
+			} elseif ($answerType==MATCHING) {
 				$j=sizeof($matching)+1;
 
-				for ($i=0;$i<sizeof($choice);$i++,$j++)
-				{
+				for ($i=0;$i<sizeof($choice);$i++,$j++) {
 					$val = $choice[$j];
-					if (preg_match_all ('#<font color="red"><s>([0-9a-z ]*)</s></font>#', $val, $arr1))
+					if (preg_match_all ('#<font color="red"><s>([0-9a-z ]*)</s></font>#', $val, $arr1)) {
 						$val = $arr1[1][0];
+					}						
 					$val=addslashes($val);
 					$val=strip_tags($val);
 					$sql = "select position from $table_ans where question_id='".Database::escape_string($questionId)."' and answer='".Database::escape_string($val)."' AND correct=0";
@@ -580,21 +526,15 @@ if($formSent)
 					exercise_attempt($questionScore,$answer,$quesId,$exeId,$j);
 
 				}
-			}
-			elseif ($answerType==FREE_ANSWER)
-			{
+			} elseif ($answerType==FREE_ANSWER) {
 				$answer = $choice;
 				exercise_attempt($questionScore,$answer,$quesId,$exeId,0);
-			}
-			elseif ($answerType==UNIQUE_ANSWER)
-			{
+			} elseif ($answerType==UNIQUE_ANSWER) {
 				$sql = "select id from $table_ans where question_id='".Database::escape_string($questionId)."' and position='".Database::escape_string($choice)."'";
 				$res = api_sql_query($sql, __FILE__, __LINE__);
 				$answer = mysql_result($res,0,"id");
 				exercise_attempt($questionScore,$answer,$quesId,$exeId,0);
-			}
-			else
-			{
+			} else {
 				exercise_attempt($questionScore,$answer,$quesId,$exeId,0);
 			}
 		}
@@ -602,71 +542,73 @@ if($formSent)
 		api_sql_query('UPDATE '.$stat_table.' SET exe_result = exe_result + '.(int)$totalScore.',exe_weighting = exe_weighting + '.(int)$totalWeighting.' WHERE exe_id = '.$exe_id,__FILE__,__LINE__);
 //END of saving and qualifying
 //------------------------------------------------------------------------------------------
-//			
+//	
 				endif;
 
-                if (isset($_POST['hotspot']))
-                {
+                if (isset($_POST['hotspot'])) {
                 	$exerciseResultCoordinates[$key] = $_POST['hotspot'][$key];
                 }
             }
         }
-        if($debug>0){echo str_repeat('&nbsp;',0).'$choice is an array - end'."<br />\n";}
+        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');
-//var_dump($questionList,$exerciseResult);exit;
+
     // if it is the last question (only for a sequential exercise)
-    if($exerciseType == 1 || $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($exerciseType == 1 || $questionNum >= $nbrQuestions) {
+        if ($debug>0) {
+        	echo str_repeat('&nbsp;',0).'Redirecting to exercise_result.php - Remove debug option to let this happen'."<br />\n";
+        }
 		 // goes to the script that will show the result of the exercise
-        if($exerciseType == 1){
-        	header("Location: exercise_result.php?exerciseType=$exerciseType&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
-        } else {
+        if ($exerciseType == 1) {
+    	   	header("Location: exercise_result.php?exerciseType=$exerciseType&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
+	    } else {
         	//clean incomplete
         	api_sql_query('UPDATE '.$stat_table.' SET '."status = '', data_tracking='', exe_date = '".date('Y-m-d H:i:s')."'".' WHERE exe_id = '.$exe_id,__FILE__,__LINE__);
         	header("Location: exercise_show.php?id=$exeId");
         }
         exit();
     }
-    if($debug>0){echo str_repeat('&nbsp;',0).'$formSent was set - end'."<br />\n";}
+    if ($debug>0) {
+    	echo str_repeat('&nbsp;',0).'$formSent was set - end'."<br />\n";
+    }
 }
 
 // if the object is not in the session
-if(!isset($_SESSION['objExercise']) || $origin == 'learnpath' || $_SESSION['objExercise']->id != $_REQUEST['exerciseId'])
-{
-    if($debug>0){echo str_repeat('&nbsp;',0).'$_SESSION[objExercise] was unset'."<br />\n";}
+if (!isset($_SESSION['objExercise']) || $origin == 'learnpath' || $_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') ))
-    {
+    if (!$objExercise->read($exerciseId) || (!$objExercise->selectStatus() && !$is_allowedToEdit && ($origin != 'learnpath') )) {
     	unset($objExercise);
     	$error = get_lang('ExerciseNotFound');
         //die(get_lang('ExerciseNotFound'));
-    }
-    else
-    {
+    } 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 - set now - end'."<br />\n";
+	    }
     }
 }
 
-if(!isset($objExcercise) && isset($_SESSION['objExercise'])){
+if (!isset($objExcercise) && isset($_SESSION['objExercise'])) {
 	$objExercise = $_SESSION['objExercise'];
 }
-if(!is_object($objExercise))
-{
+if (!is_object($objExercise)) {
 	header('Location: exercice.php');
 	exit();
 }
-
 $Exe_starttime = $objExercise->start_time;
 $Exe_endtime = $objExercise->end_time;
 $quizID = $objExercise->selectId();
@@ -675,14 +617,14 @@ $exerciseTitle=$objExercise->selectTitle();
 $exerciseDescription=$objExercise->selectDescription();
 $exerciseDescription=stripslashes($exerciseDescription);
 $exerciseSound=$objExercise->selectSound();
-//$randomQuestions=$objExercise->isRandom();
+$randomQuestions=$objExercise->isRandom();
 $exerciseType=$objExercise->selectType();
 
 if(!isset($_SESSION['questionList']) || $origin == 'learnpath')
 {
     if($debug>0){echo str_repeat('&nbsp;',0).'$_SESSION[questionList] was unset'."<br />\n";}
     // selects the list of question ID
-    $questionList = $objExercise->questionList;//($randomQuestions?$objExercise->selectRandomList():$objExercise->selectQuestionList());
+    $questionList = ($randomQuestions?$objExercise->selectRandomList():$objExercise->selectQuestionList());
     // saves the question list into the session
     api_session_register('questionList');
     if($debug>0){echo str_repeat('&nbsp;',0).'$_SESSION[questionList] was unset - set now - end'."<br />\n";}
@@ -707,6 +649,8 @@ if(!$questionNum || $_POST['questionNum'])
     }
 }
 
+
+
 //$nameTools=get_lang('Exercice');
 
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
@@ -869,29 +813,28 @@ echo "<h3>".$exerciseTitle."</h3>";
 if( $exerciseAttempts > 0){
 	$user_id = api_get_user_id();
 	$course_code = api_get_course_id();
-	$sql = 'SELECT count(*)
-			FROM '.Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES).'
-			WHERE exe_exo_id = '.$quizID.' '.
-			"and status != 'incomplete' ".
+ 	$sql = 'SELECT count(*)
+ 	        FROM '.Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES).'
+ 	        WHERE exe_exo_id = '.$quizID.' '.
 			'and exe_user_id = '.$user_id.' '.
-			"and exe_cours_id = '$course_code'";
-	$aquery = api_sql_query($sql, __FILE__, __LINE__);
-	$attempt = Database::fetch_array($aquery);
-	
-	if( $attempt[0] >= $exerciseAttempts ){ 
-		if(api_is_allowed_to_edit()){
-			Display::display_warning_message(sprintf(get_lang('ReachedMaxAttemptsAdmin'),$exerciseTitle,$exerciseAttempts));
-		} else {
-			Display::display_warning_message(sprintf(get_lang('ReachedMaxAttempts'),$exerciseTitle,$exerciseAttempts));
-		    Display::display_footer();	
-		    exit;
+			"and status != 'incomplete' ".
+            "and exe_cours_id = '$course_code'".' and session_id = '."'".(int)$_SESSION['id_session']."'";
+
+ 	$aquery = api_sql_query($sql, __FILE__, __LINE__);
+ 	$attempt = Database::fetch_array($aquery);
+ 	  	 
+    if ( $attempt[0] >= $exerciseAttempts ) {
+    	if (!api_is_allowed_to_edit()) {
+	    	Display::display_warning_message(sprintf(get_lang('ReachedMaxAttempts'),$exerciseTitle,$exerciseAttempts));
+	 	  	Display::display_footer();
+	 	  	exit;
+	    } else {
+	        Display::display_warning_message(sprintf(get_lang('ReachedMaxAttemptsAdmin'),$exerciseTitle,$exerciseAttempts));
 		}
 	}
-	
-	
-}	
+}	  	 
 
-if(!function_exists('convert_date_to_number')){
+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);
@@ -908,11 +851,10 @@ if($limit_time_exists){
 	$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($permission_to_start == false || $exercise_timeover == true ){ //
     	if(!api_is_allowed_to_edit()){
-    		$message_warning = ($permission_to_start == false)? get_lang('ExerciseNoStartedYet').' %s' : get_lang('ReachedTimeLimit') ;
-	    	Display::display_warning_message(sprintf($message_warning,(($permission_to_start == false)?$Exe_starttime:$Exe_endttime)));
+    		$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 {
@@ -922,7 +864,6 @@ if($limit_time_exists){
 	}
 }
 
-
 if(!empty($error))
 {
 	Display::display_error_message($error,false);
@@ -941,7 +882,7 @@ else
 	$number_of_hotspot_questions = 0;
 	$onsubmit = '';
 	$i=0;
-
+	
 	foreach($questionList as $questionId)
 	{
 		$i++;
@@ -979,18 +920,22 @@ else
 	}
 	$s="<p>$exerciseDescription</p>";
 	
-	if($origin == 'learnpath' && $exerciseType==2){
+	if($exerciseType==2){
 		$s2 = "&exerciseId=".$exerciseId;
 	}
 	$s.=" <form method='post' action='".api_get_self()."?autocomplete=off".$s2."' 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."' />
-	 <input type='hidden' name='exerciseId' value='".$exerciseId."' />";
+	<table width='100%' border='0' cellpadding='1' cellspacing='0'>
+	 <tr>
+	  <td>
+	  <table width='100%' cellpadding='3' cellspacing='0' border='0'>";
 	echo $s;
 	
 	$i=0;
@@ -1027,10 +972,12 @@ else
 			}
 		}
 	
-		$s="<div class=\"sectiontitle\"><img src=\"".api_get_path(WEB_IMG_PATH)."test.gif\" align=\"absmiddle\">".get_lang('Question')." ";
+		$s="<tr>
+		 <td width='3%' bgcolor='#e6e6e6'><img src=\"".api_get_path(WEB_IMG_PATH)."test.gif\" align=\"absmiddle\"></td>
+		 <td valign='middle' bgcolor='#e6e6e6'>
+			".get_lang('Question')." ";
 		$s.=$i.' : ';
-		//$s.='</div>';
-		if($exerciseType == 2) $s.=' / '.$nbrQuestions.' ';
+		if($exerciseType == 2) $s.=' / '.$nbrQuestions;
 	
 		echo $s;
 	
@@ -1045,7 +992,12 @@ else
 		}
 	}	// end foreach()
 	
-	$s="<!-- <input type='submit' name='buttonCancel' value=".get_lang('Cancel')." />
+	$s="</table>
+	  </td>
+	 </tr>
+	 <tr>
+	  <td>
+		 <!-- <input type='submit' name='buttonCancel' value=".get_lang('Cancel')." />
 	   &nbsp;&nbsp; //-->
 		 <input type='submit' name='submit' value='";
 	
@@ -1059,13 +1011,12 @@ else
 	  }
 	  //$s.='\'&gt;';
 	  $s.= '\' />';
-	  $s.="</form>";
+	  $s.="</td></tr></form></table>";
 	
 	$b=2;
 	echo $s;
 }
 
-	//creating empty exercise if incomplete not exist
     if($_configuration['live_exercise_tracking'] == true):
     	//if($questionNum < 2){
     	if($table_recorded_not_exist){
@@ -1083,7 +1034,8 @@ else
 		}
 	endif;
 
+//var_dump($_SESSION);exit;
 if ($origin != 'learnpath') { //so we are not in learnpath tool
     Display::display_footer();
 } 
-?>
+?>
\ No newline at end of file