From 5d14d5ec7396fcffaeaa429de697924eac266f69 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 19 Oct 2010 13:13:14 +0200
Subject: [PATCH 1/4] Fixing delete condition in works see BT#1673

---
 main/work/work.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/work/work.php b/main/work/work.php
index 7fb674e095..e01a42b150 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -784,7 +784,7 @@ else {
 			$author_qry = Database::query($author_sql);
             
 
-			if (Database :: num_rows($author_qry) == 1 AND api_get_course_setting('student_delete_own_publication') == 1 || api_is_allowed_to_edit(null,true)) {
+			if ((Database :: num_rows($author_qry) == 1 AND api_get_course_setting('student_delete_own_publication') == 1) || api_is_allowed_to_edit(null,true)) {
 				//we found the current user is the author
 				$queryString1 = "SELECT url FROM  " . $work_table . "  WHERE id = '$delete'";                
 				$result1 = Database::query($queryString1);				

From cf4dbd80a7f30fec3ca214c2c678e4858aed2db3 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 19 Oct 2010 18:22:49 +0200
Subject: [PATCH 2/4] Minor Cleaning file

---
 main/exercice/exercise.lib.php | 74 +++-------------------------------
 1 file changed, 6 insertions(+), 68 deletions(-)

diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index 958ccde47c..fc58f52043 100755
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -145,71 +145,8 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
 
 				// because [] is parsed here we follow this procedure:
 				$answer = text_filter($answer);
-				/* // Deprecated code
-				// 1. find everything between the [tex] and [/tex] tags
-				$startlocations = api_strpos($answer,'[tex]');
-				$endlocations = api_strpos($answer,'[/tex]');
-
-				if ($startlocations !== false && $endlocations !== false) {
-					$texstring = api_substr($answer,$startlocations,$endlocations-$startlocations+6);
-					// 2. replace this by {texcode}
-					$answer = str_replace($texstring,'{texcode}',$answer);
-				}
-				*/
-
-				// 3. do the normal matching parsing
-				// replaces [blank] by an input field
-
 				//getting the matches
 				$answer = api_ereg_replace('\[[^]]+\]','<input type="text" name="choice['.$questionId.'][]" size="10" />',($answer));
-
-				// Change input size
-				/*
-				preg_match_all('/\[[^]]+]/',$answer,$matches);
-				$answer=ereg_replace('\[[^]]+\]','<input type="text" name="choice['.$questionId.'][]" size="@@" />',($answer));
-
-				// 4. resize the input
-
-
-				foreach($matches[0] as $match) {
-				$answer_len = strlen($match)-2;
-				//we will only replace 1 item
-				// echo implode("replace term", explode("search term", "input", $limit));
-				if ($answer_len <= 5) {
-				$answer = (implode("5", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 10) {
-				$answer = (implode("10", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 20) {
-				$answer = (implode("20", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 30) {
-				$answer = (implode("30", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 40) {
-				$answer = (implode("45", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 50) {
-				$answer = (implode("60", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 60) {
-				$answer = (implode("70", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 70) {
-				$answer = (implode("80", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 80) {
-				$answer = (implode("90", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 90) {
-				$answer = (implode("100", explode("@@", $answer, 2)));
-				} elseif($answer_len <= 100) {
-				$answer = (implode("110", explode("@@", $answer, 2)));
-				} elseif($answer_len > 100 ) {
-				$answer = (implode("120", explode("@@", $answer, 2)));
-				}
-				}
-
-				*/
-
-				/* // Deprecated code
-				// 5. replace the {texcode by the api_pare_tex parsed code}
-				$texstring = api_parse_tex($texstring);
-				$answer=str_replace("{texcode}",$texstring,$answer);
-				*/
-
 			}
 
 			// Unique answer
@@ -356,12 +293,12 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
 	} elseif ($answerType == HOT_SPOT) {
 
 		// Question is of type HOT_SPOT
-		$questionName=$objQuestionTmp->selectTitle();
-		$questionDescription=$objQuestionTmp->selectDescription();
+		$questionName         = $objQuestionTmp->selectTitle();
+		$questionDescription  = $objQuestionTmp->selectDescription();
 
 		// Get the answers, make a list
-		$objAnswerTmp=new Answer($questionId);
-		$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
+		$objAnswerTmp         = new Answer($questionId);
+		$nbrAnswers           = $objAnswerTmp->selectNbrAnswers();
 
 		// get answers of hotpost
 		$answers_hotspot = array();
@@ -396,6 +333,7 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
 		$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
 		//$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
 		//echo $tes;
+        
 		$s .= '<script language="JavaScript" type="text/javascript" src="../plugin/hotspot/JavaScriptFlashGateway.js"></script>
 						<script src="../plugin/hotspot/hotspot.js" type="text/javascript" language="JavaScript"></script>
 						<script language="JavaScript" type="text/javascript">
@@ -530,7 +468,7 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
 					</td>
 					<td valign="top" align="left">'.$answer_list.'</td></tr>
 					</table>
-		</td></tr>';
+		</td></tr>';        
 		echo $s;
 	}
 	echo '</table><br />';

From f49c0e94e6e602113ac733d254a428f37b3ca1e8 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 19 Oct 2010 18:25:58 +0200
Subject: [PATCH 3/4] Fixing column order when using author or date see BT#1672

---
 main/work/work.lib.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 11cb6312b9..f6156bbf67 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -415,10 +415,16 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 		$i++;
 	}
 	
+    
 	if ($count_files != 0) {
-		$column_order[2] = 5;
+        if ($sub_course_dir == '/work') {
+            $column_order[2] = 2;
+        } else {
+            //$column_order[2] = 5;
+        }
 	} else {
-		$column_order[1] = 4;
+		//$column_order[1] = 4;
+        $column_order[2] = 4;
 	}
 	
 	$table_data = array();

From 5e4fee84ac4836ffcc5ef1a7f7e983f82bfe0c63 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 19 Oct 2010 18:26:25 +0200
Subject: [PATCH 4/4] Fixing exercise_show and exercise_results requires
 testing

---
 main/exercice/exercice_submit.php            |   7 +-
 main/exercice/exercise.class.php             | 547 ++++++++++++++++---
 main/exercice/exercise_result.php            |   4 +-
 main/exercice/exercise_show.php              | 259 ++++-----
 main/inc/lib/events.lib.inc.php              |  17 +
 main/inc/lib/exercise_show_functions.lib.php | 157 +-----
 6 files changed, 581 insertions(+), 410 deletions(-)

diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php
index f074d6a13e..2015f09694 100755
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
@@ -25,6 +25,8 @@ require_once 'question.class.php';
 require_once 'answer.class.php';
 require_once 'exercise.lib.php';
 
+
+
 // debug var. Set to 0 to hide all debug display. Set to 1 to display debug messages.
 $debug = 1;
 
@@ -32,6 +34,7 @@ $debug = 1;
 $language_file = 'exercice';
 
 require_once '../inc/global.inc.php';
+
 $this_section = SECTION_COURSES;
 
 // Notice for unauthorized people.
@@ -323,7 +326,7 @@ if ($_configuration['live_exercise_tracking'] && $objExercise->type == ONE_PER_P
 
 // if the user has submitted the form
 
-if ($formSent) {
+if ($formSent && isset($_POST)) {    
     if ($debug > 0) { error_log('$formSent was set'); }
 
     // Initializing
@@ -371,7 +374,7 @@ if ($formSent) {
                     $choice = $exerciseResult[$questionId];                    
                     if (isset($exe_id)) {
                     	//Manage the question and answer attempts
-                    	$objExercise->manage_answer($exe_id, $questionId, $choice,'exercise_show');
+                    	$objExercise->manage_answer($exe_id, $questionId, $choice,'exercise_show', true, false,false);
                     }
                     //END of saving and qualifying
                 }
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 1ac46e1990..3029d138d1 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -16,6 +16,8 @@ define('EXERCISE_FEEDBACK_TYPE_END',0);
 define('EXERCISE_FEEDBACK_TYPE_DIRECT',1);
 define('EXERCISE_FEEDBACK_TYPE_EXAM',2);
 
+require_once '../inc/lib/exercise_show_functions.lib.php';
+
 if(!class_exists('Exercise')):
 
 class Exercise {
@@ -1638,9 +1640,13 @@ class Exercise {
      * @param   int the choice the user selected
      * @param   string  function is called from 'exercise_show' or 'exercise_result'
 	 */
-	function manage_answer($exeId, $questionId, $choice, $from = 'exercise_show') {
+	function manage_answer($exeId, $questionId, $choice, $from = 'exercise_show', $saved_results = true, $from_database = false, $show_result = true) {        
 		global $_configuration;
-		$exeId = intval($exeId);
+        
+		$exeId = intval($exeId);        
+        $TBL_TRACK_ATTEMPT      = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $table_ans              = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        
                     
      	// Creates a temporary Question object
         $objQuestionTmp         = Question :: read($questionId);
@@ -1649,7 +1655,8 @@ class Exercise {
         $questionDescription 	= $objQuestionTmp->selectDescription();
         $questionWeighting 		= $objQuestionTmp->selectWeighting();
         $answerType 			= $objQuestionTmp->selectType();
-        $quesId 				= $objQuestionTmp->selectId(); //added by priya saini
+        $quesId 				= $objQuestionTmp->selectId();
+        
         $totalWeighting 		= 0;
         $totalScore				= 0;
 
@@ -1668,7 +1675,7 @@ class Exercise {
             $nbrAnswers = 1;
         }   
         $user_answer = '';             
-        $table_ans   = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        
                 
         // Get answer list for matching
         $sql_answer = 'SELECT id, answer FROM '.$table_ans.' WHERE question_id="'.Database::escape_string($questionId).'" ';
@@ -1679,48 +1686,108 @@ class Exercise {
         }        
         
 		$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);
+            $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;
-                    }
+                    if ($from_database) {
+                    	$queryans = "select answer from ".$TBL_TRACK_ATTEMPT." where exe_id = '".$exeId."' and question_id= '".$questionId."'";
+                        $resultans = Database::query($queryans);
+                        $choice = Database::result($resultans,0,"answer");
+        
+                        $numAnswer=$objAnswerTmp->selectAutoId($answerId);
+        
+                        $studentChoice=($choice == $numAnswer)?1:0;
+                        if ($studentChoice) {
+                            $questionScore+=$answerWeighting;
+                            $totalScore+=$answerWeighting;
+                        }
+                    } else {
+                    	$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) {
+                case MULTIPLE_ANSWER :                
+                    if ($from_database) {
+                        $choice=array();
+                        $queryans = "SELECT * FROM ".$TBL_TRACK_ATTEMPT." where exe_id = '".$exeId."' and question_id= '".$questionId."'";                        
+                        $resultans = Database::query($queryans);
+                        while ($row = Database::fetch_array($resultans)) {
+                            $ind = $row['answer'];
+                            $choice[$ind] = 1;
+                        }
+                        
+                        $numAnswer=$objAnswerTmp->selectAutoId($answerId);
+                        $studentChoice=$choice[$numAnswer];
                         if ($studentChoice) {
-                            $real_answers[$answerId] = true;
-                        } else {
-                            $real_answers[$answerId] = false;
+                            $questionScore+=$answerWeighting;
+                            $totalScore+=$answerWeighting;
                         }
-                    } else {
+                    } else {                        
+                        $studentChoice=$choice[$numAnswer];
                         if ($studentChoice) {
-                            $real_answers[$answerId] = false;
+                            $questionScore+=$answerWeighting;
+                            $totalScore+=$answerWeighting;
+                        } 
+                    }                   
+                    break;
+                case MULTIPLE_ANSWER_COMBINATION:                
+                    if ($from_database) {                      
+                                 
+                        $queryans = "SELECT * from ".$TBL_TRACK_ATTEMPT." where exe_id = '".$exeId."' and question_id= '".$questionId."'";
+                        $resultans = Database::query($queryans);
+                        while ($row = Database::fetch_array($resultans)) {
+                            $ind = $row['answer'];
+                            $choice[$ind] = 1;
+                        }
+                        $numAnswer=$objAnswerTmp->selectAutoId($answerId);
+                        $studentChoice=$choice[$numAnswer];
+        
+                        if ($answerCorrect == 1) {
+                            if ($studentChoice) {
+                                $real_answers[$answerId] = true;
+                            } else {
+                                $real_answers[$answerId] = false;
+                            }
                         } else {
-                            $real_answers[$answerId] = true;
+                            if ($studentChoice) {
+                                $real_answers[$answerId] = false;
+                            } else {
+                                $real_answers[$answerId] = true;
+                            }
+                        }                        
+                    } else {
+                        $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;
+                        $final_answer = true;
+                        foreach($real_answers as $my_answer) {
+                            if (!$my_answer) {
+                                $final_answer = false;
+                            }
                         }
                     }
                     break;
@@ -1731,24 +1798,19 @@ class Exercise {
                     // 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]);
 
@@ -1770,7 +1832,6 @@ class Exercise {
                     */
                     $answer = '';
                     $j = 0;
-
                     //initialise answer tags
                     $user_tags = array ();
                     $correct_tags = array ();
@@ -1800,8 +1861,26 @@ class Exercise {
                             // adds the end of the text
                             $answer .= $temp;
                             break;
-                        }
-                        $choice[$j] = trim($choice[$j]);
+                        }                        
+                        if ($from_database) {
+                            $queryfill = "SELECT answer FROM ".$TBL_TRACK_ATTEMPT." WHERE exe_id = '".Database::escape_string($exeId)."' AND question_id= '".Database::escape_string($questionId)."'";
+                            $resfill = Database::query($queryfill);
+                            $str = Database::result($resfill,0,'answer');
+                            
+                            preg_match_all('#\[([^[]*)\]#', $str, $arr);
+                            $str = str_replace('\r\n', '', $str);
+                            $choice = $arr[1];
+    
+                            $tmp=strrpos($choice[$j],' / ');
+                            $choice[$j]=api_substr($choice[$j],0,$tmp);
+                            $choice[$j]=trim($choice[$j]);
+    
+                            //Needed to let characters ' and " to work as part of an answer
+                            $choice[$j] = stripslashes($choice[$j]);
+                        } else {
+                            $choice[$j] = trim($choice[$j]);	
+                        }                       
+                        
                         $user_tags[] = api_strtolower($choice[$j]);
                         //put the contents of the [] answer tag into correct_tags[]
                         $correct_tags[] = api_strtolower(api_substr($temp, 0, $pos));
@@ -1809,7 +1888,6 @@ class Exercise {
                         $temp = api_substr($temp, $pos +1);
                         //$answer .= ']';
                     }
-
                     $answer = '';
                     $real_correct_tags = $correct_tags;
                     $chosen_list = array ();
@@ -1818,7 +1896,6 @@ class Exercise {
                         if ($i == 0) {
                             $answer .= $real_text[0];
                         }
-
                         if (!$switchable_answer_set) {
                         	//needed to parse ' and " characters
                         	$user_tags[$i] = stripslashes($user_tags[$i]);
@@ -1866,43 +1943,129 @@ class Exercise {
                             $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;
-                            $user_answer = '<span>'.$answer_matching[$choice[$numAnswer]].'</span>';
+                    if ($from_database) {                        
+                        $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." WHERE exe_id = '".Database::escape_string($exeId)."' AND question_id= '".Database::escape_string($questionId)."'";
+                        $resq   = Database::query($query);
+                        $choice = Database::result($resq,0,'answer');
+                        $choice = str_replace('\r\n', '', $choice);
+                        $choice = stripslashes($choice);
+            
+                        $questionScore = Database::result($resq,0,"marks");
+                        if ($questionScore==-1) {
+                            $totalScore+=0;
                         } else {
-                            $user_answer = '<span style="color: #FF0000; text-decoration: line-through;">'.$answer_matching[$choice[$numAnswer]].'</span>';                    
-                        }         
-                        $matching[$numAnswer] =  $choice[$numAnswer];
+                            $totalScore+=$questionScore;
+                        }
+                        $arrques[] = $questionName;
+                        $arrans[]  = $choice;   
+                    } else {
+                        $studentChoice = $choice;
+                        if ($studentChoice) {
+                            //@todo verify this--> set to -1 because the question has'nt been corrected 
+                            $questionScore = -1;
+                            $totalScore += 0;
+                        }                        
                     }
                     break;
+                    // for matching
+                case MATCHING :                
+                    if ($from_database) {                                    
+                        $sql_answer = 'SELECT id, answer FROM '.$table_ans.' WHERE question_id="'.Database::escape_string($questionId).'" AND correct=0';
+                        $res_answer = Database::query($sql_answer);
+                        // getting the real answer
+                        $real_list =array();
+                        while ($real_answer = Database::fetch_array($res_answer)) {
+                            $real_list[$real_answer['id']]= $real_answer['answer'];
+                        }
+            
+                        $sql_select_answer = 'SELECT id, answer, correct, id_auto FROM '.$table_ans.'
+                                              WHERE question_id="'.Database::escape_string($questionId).'" AND correct <> 0 ORDER BY id_auto';
+            
+                        $res_answers = Database::query($sql_select_answer);
+                        if ($show_result) {
+                            echo '<table width="100%" height="71" border="0" cellspacing="3" cellpadding="3" >';
+                            echo '<tr><td colspan="2">&nbsp;</td></tr>';
+                            echo '<tr>
+                                    <td><span style="font-style: italic;">'.get_lang('ElementList').'</span> </td>
+                                    <td><span style="font-style: italic;">'.get_lang('CorrespondsTo').'</span></td>
+                                  </tr>';
+                            echo '<tr><td colspan="2">&nbsp;</td></tr>';
+                        }
+                        $questionScore = 0;
+            
+                        while ($a_answers = Database::fetch_array($res_answers)) {        
+                            $i_answer_id    = $a_answers['id']; //3
+                            $s_answer_label = $a_answers['answer'];  // your daddy - your mother
+                            $i_answer_correct_answer = $a_answers['correct']; //1 - 2
+                            $i_answer_id_auto = $a_answers['id_auto']; // 3 - 4
+            
+                            $sql_user_answer = "SELECT answer FROM $TBL_TRACK_ATTEMPT
+                                                WHERE exe_id = '$exeId' AND question_id = '$questionId' AND position='$i_answer_id_auto'";
+            
+                            $res_user_answer = Database::query($sql_user_answer);
+            
+                            if (Database::num_rows($res_user_answer)>0 ) {
+                                $s_user_answer = Database::result($res_user_answer,0,0); //  rich - good looking
+                            } else {
+                                $s_user_answer = 0;
+                            }            
+                            $i_answerWeighting=$objAnswerTmp->selectWeighting($i_answer_id);            
+                            $user_answer = '';            
+                            if (!empty($s_user_answer)) {
+                                if ($s_user_answer == $i_answer_correct_answer) {
+                                    $questionScore  += $i_answerWeighting;
+                                    $totalScore     += $i_answerWeighting;
+                                    $user_answer = '<span>'.$real_list[$i_answer_correct_answer].'</span>';
+                                } else {
+                                    $user_answer = '<span style="color: #FF0000; text-decoration: line-through;">'.$real_list[$s_user_answer].'</span>';
+                                }
+                            }
+                            if ($show_result) {
+                                echo '<tr>';
+                                echo '<td>'.$s_answer_label.'</td><td>'.$user_answer.' / <b><span style="color: #008000;">'.$real_list[$i_answer_correct_answer].'</span></b></td>';
+                                echo '</tr>';
+                            }
+                        }
+                        break(2); //break the switch and the for condition                    
+                    } else {                   
+                        $numAnswer=$objAnswerTmp->selectAutoId($answerId);
+                        if ($answerCorrect) {
+                            if ($answerCorrect == $choice[$numAnswer]) {
+                                $questionScore+=$answerWeighting;
+                                $totalScore+=$answerWeighting;
+                                $user_answer = '<span>'.$answer_matching[$choice[$numAnswer]].'</span>';
+                            } else {
+                                $user_answer = '<span style="color: #FF0000; text-decoration: line-through;">'.$answer_matching[$choice[$numAnswer]].'</span>';                    
+                            }         
+                            $matching[$numAnswer] =  $choice[$numAnswer];
+                        }
+                        break;
+                    }  
+                    
                     // for hotspot with no order
                 case HOT_SPOT :
-                    $studentChoice = $choice[$answerId];
-                    if ($studentChoice) {
-                        $questionScore += $answerWeighting;
-                        $totalScore += $answerWeighting;
+                    if ($from_database) {                      
+                        if ($show_result) {
+                            $TBL_TRACK_HOTSPOT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
+                            $query = "select hotspot_correct from ".$TBL_TRACK_HOTSPOT." where hotspot_exe_id = '".Database::escape_string($exeId)."' and hotspot_question_id= '".Database::escape_string($questionId)."' AND hotspot_answer_id='".Database::escape_string($answerId)."'";
+                            $resq=Database::query($query);
+                            $studentChoice = Database::result($resq,0,"hotspot_correct");                                
+                        }
+                    }  else {
+                        $studentChoice = $choice[$answerId];
+                        if ($studentChoice) {
+                            $questionScore += $answerWeighting;
+                            $totalScore += $answerWeighting;
+                        }
                     }
                     break;
-                    // for hotspot with fixed order
+                    // @todo never added to chamilo 
+                    //for hotspot with fixed order
                 case HOT_SPOT_ORDER :
                     $studentChoice = $choice['order'][$answerId];
-
                     if ($studentChoice == $answerId) {
                         $questionScore += $answerWeighting;
                         $totalScore += $answerWeighting;
@@ -1911,12 +2074,83 @@ class Exercise {
                         $studentChoice = false;
                     }
                     break;
-            } // end switch Answertype
+            } // end switch Answertype            
             
-            if ($from == 'exercise_result') {
-                global $origin;
+            global $origin;
+            
+            if ($show_result) {                
+                if ($from == 'exercise_result') {         
+                        //display answers (if not matching type, or if the answer is correct)
+                    if ($answerType != MATCHING || $answerCorrect) {
+                        if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_COMBINATION) {
+                            if ($origin!='learnpath') {
+                                ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,0,0,0);
+                            }
+                        } elseif($answerType == FILL_IN_BLANKS) {
+                            if ($origin!='learnpath') {
+                                ExerciseShowFunctions::display_fill_in_blanks_answer($answer,0,0);
+                            }
+                        } elseif($answerType == FREE_ANSWER) {
+                            // to store the details of open questions in an array to be used in mail
+                            $arrques[] = $questionName;
+                            $arrans[]  = $choice;
+                            if($origin != 'learnpath') {
+                                ExerciseShowFunctions::display_free_answer($choice,0,0);
+                            }
+                        } elseif($answerType == HOT_SPOT) {
+                            exit;
+                            if ($origin != 'learnpath') {
+                                ExerciseShowFunctions::display_hotspot_answer($answerId, $answer, $studentChoice, $answerComment);
+                            }
+                        } elseif($answerType == HOT_SPOT_ORDER) {
+                            ExerciseShowFunctions::display_hotspot_order_answer($answerId, $answer, $studentChoice, $answerComment);
+                        } elseif($answerType==MATCHING) {
+                            if ($origin != 'learnpath') {
+                                echo '<tr>';
+                                echo '<td>'.text_filter($answer_matching[$answerId]).'</td><td>'.text_filter($user_answer).' / <b><span style="color: #008000;">'.text_filter($answer_matching[$answerCorrect]).'</span></b></td>';
+                                echo '</tr>';
+                            }
+                        }
+                    }
+                } else {                  
+                    switch($answerType) {
+                        case UNIQUE_ANSWER : 
+                        case MULTIPLE_ANSWER : 
+                    	case MULTIPLE_ANSWER_COMBINATION :                
+                            if ($answerId==1) {                                
+                                ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,$exeId,$questionId,$answerId);
+                            } else {
+                                ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,$exeId,$questionId,"");
+                            }
+                            break;
+                        case FILL_IN_BLANKS:
+                            echo '<tr><td>';
+                            ExerciseShowFunctions::display_fill_in_blanks_answer($answer,$exeId,$questionId);
+                            echo '</td></tr>';
+                        break;
+                        case FREE_ANSWER:
+                            echo '<tr>
+                            <td valign="top">'.ExerciseShowFunctions::display_free_answer($choice, $exeId, $questionId).'</td>
+                            </tr>
+                            </table>';
+                        break;
+                        case HOT_SPOT:
+                            //ExerciseShowFunctions::display_hotspot_answer($answerId, $answer, $studentChoice, $answerComment);
+                            break;                    
+                        case HOT_SPOT_ORDER:                            
+                            ExerciseShowFunctions::display_hotspot_order_answer($answerId, $answer, $studentChoice, $answerComment);                                   
+                        break;
+                        case MATCHING:
+                         if ($origin != 'learnpath') {
+                                echo '<tr>';
+                                echo '<td>'.text_filter($answer_matching[$answerId]).'</td><td>'.text_filter($user_answer).' / <b><span style="color: #008000;">'.text_filter($answer_matching[$answerCorrect]).'</span></b></td>';
+                                echo '</tr>';
+                            }                        
+                        break;
+                    }	  
+                }
                     //display answers (if not matching type, or if the answer is correct)
-                if ($answerType != MATCHING || $answerCorrect) {
+              /*  if ($answerType != MATCHING || $answerCorrect) {
                     if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_COMBINATION) {
                         if ($origin!='learnpath') {
                             ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,0,0,0);
@@ -1945,22 +2179,33 @@ class Exercise {
                             echo '</tr>';
                         }
                     }
-                }
-            }            
+                }*/
+            }       
         } // end for that loops over all answers of the current question
         
         // destruction of Answer
 
+        if ($answerType == HOT_SPOT) {         
+            $queryfree = "select marks from ".$TBL_TRACK_ATTEMPT." where exe_id = '".Database::escape_string($exeId)."' and question_id= '".Database::escape_string($questionId)."'";
+            $resfree = Database::query($queryfree);
+            $questionScore= Database::result($resfree,0,"marks");
+        }
+
+        $final_answer = true;
+        foreach($real_answers as $my_answer) {
+            if (!$my_answer) {
+                $final_answer = false;
+            }
+        }        
         //we add the total score after dealing with the answers
-        if ($answerType == MULTIPLE_ANSWER_COMBINATION) {
+        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;
             }
-        }
-        
+        }        
         
        if ($from == 'exercise_result') {
             global $colspan;
@@ -1968,7 +2213,7 @@ class Exercise {
             // TODO Change this, because it is wrong to show the user some results that haven't been stored in the database yet
             if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER) {
                     // We made an extra table for the answers
-                    if($origin != 'learnpath') {
+                    if($origin != 'learnpath') {                        
                         echo '</table></td></tr>';
                         echo '<tr>
                             <td colspan="2">';
@@ -1980,16 +2225,17 @@ class Exercise {
                         </tr>';                    
                     }
                 }
-            ?>
-            <?php if($origin != 'learnpath') { ?>
+            if($origin != 'learnpath') { ?>
                 <tr>
                 <td colspan="<?php echo $colspan; ?>" align="left">
                     <b>
-                    <?php
-                    if($questionScore==-1){
-                        echo get_lang('Score').": 0 /".float_format($questionWeighting);
-                    } else {
-                        echo get_lang('Score').": ".float_format($questionScore,1)."/".float_format($questionWeighting,1);
+                    <?php                    
+                    if ($this->type == ALL_ON_ONE_PAGE) {
+                        if($questionScore==-1){
+                            echo get_lang('Score').": 0 /".float_format($questionWeighting);
+                        } else {
+                            echo get_lang('Score').": ".float_format($questionScore,1)."/".float_format($questionWeighting,1);
+                        }
                     }
                     ?></b><br /><br />
                 </td>
@@ -2003,11 +2249,11 @@ class Exercise {
         $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 ($saved_results) {
             if (empty ($choice)) {
                 $choice = 0;
             }
@@ -2053,13 +2299,132 @@ class Exercise {
             }
         }
             
-        if ($from == 'exercise_show') {
+        if ($saved_results) {
             $stat_table 			= Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
             $sql_update = 'UPDATE ' . $stat_table . ' SET exe_result = exe_result + ' . (int) $totalScore . ',exe_weighting = exe_weighting + ' . (int) $totalWeighting . ' WHERE exe_id = ' . $exeId;
     		Database::query($sql_update);
-        }        
+        }
         return array('score'=>$questionScore, 'weight'=>$questionWeighting);
 	} //End function
+    
+    
+    
+
+    function send_notification($arrques, $arrans, $to) {
+        global $courseName, $exerciseTitle, $url_email;
+        require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
+        $user_info = UserManager::get_user_info_by_id(api_get_user_id());
+
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+            return '';
+        }
+
+        $mycharset = api_get_system_encoding();
+        $msg = '<html><head>
+                <link rel="stylesheet" href="'.api_get_path(WEB_CODE_PATH).'css/'.api_get_setting('stylesheets').'/default.css" type="text/css">
+                <meta content="text/html; charset='.$mycharset.'" http-equiv="content-type"></head>';
+        if(count($arrques)>0) {
+            $msg .= '<body>
+            <p>'.get_lang('OpenQuestionsAttempted').' :
+            </p>
+            <p>'.get_lang('AttemptDetails').' : <br />
+            </p>
+            <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">
+                                                    <tr>
+                <td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td>
+                <td width="469" valign="top"><h2>#course#</h2></td>
+              </tr>
+              <tr>
+                <td width="229" valign="top" class="outerframe">&nbsp;&nbsp;'.get_lang('TestAttempted').'</span></td>
+                <td width="469" valign="top" class="outerframe">#exercise#</td>
+              </tr>
+              <tr>
+                <td valign="top">&nbsp;&nbsp;<span class="style10">'.get_lang('StudentName').'</span></td>
+                <td valign="top" >#firstName# #lastName#</td>
+              </tr>
+              <tr>
+                <td valign="top" >&nbsp;&nbsp;'.get_lang('StudentEmail').' </td>
+                <td valign="top"> #mail#</td>
+            </tr></table>
+            <p><br />'.get_lang('OpenQuestionsAttemptedAre').' :</p>
+             <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">';
+
+            for($i=0;$i<sizeof($arrques);$i++) {
+                      $msg.='
+                            <tr>
+                        <td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;<span class="style10">'.get_lang('Question').'</span></td>
+                        <td width="473" valign="top" bgcolor="#F3F3F3"><span class="style16"> #questionName#</span></td>
+                            </tr>
+                            <tr>
+                        <td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;<span class="style10">'.get_lang('Answer').' </span></td>
+                        <td valign="top" bgcolor="#F3F3F3"><span class="style16"> #answer#</span></td>
+                            </tr>';
+
+                            $msg1= str_replace("#exercise#",$exerciseTitle,$msg);
+                            $msg= str_replace("#firstName#",$user_info['firstname'],$msg1);
+                            $msg1= str_replace("#lastName#",$user_info['lastname'],$msg);
+                            $msg= str_replace("#mail#",$user_info['email'],$msg1);
+                            $msg1= str_replace("#questionName#",$arrques[$i],$msg);
+                            $msg= str_replace("#answer#",$arrans[$i],$msg1);
+                            $msg1= str_replace("#i#",$i,$msg);
+                            $msg= str_replace("#course#",$courseName,$msg1);
+            }
+            $msg.='</table><br>
+                            <span class="style16">'.get_lang('ClickToCommentAndGiveFeedback').',<br />
+                            <a href="#url#">#url#</a></span></body></html>';
+
+            $msg1= str_replace("#url#",$url_email,$msg);
+            $mail_content = $msg1;
+
+            $subject = get_lang('OpenQuestionsAttempted');
+
+
+            $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
+            $email_admin = api_get_setting('emailAdministrator');
+            $result = @api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset));
+        } else {
+
+            $msg .= '<body>
+            <p>'.get_lang('ExerciseAttempted').' <br />
+            </p>
+            <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">
+                <tr>
+                <td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td>
+                <td width="469" valign="top"><h2>#course#</h2></td>
+              </tr>
+              <tr>
+                <td width="229" valign="top" class="outerframe">&nbsp;&nbsp;'.get_lang('TestAttempted').'</span></td>
+                <td width="469" valign="top" class="outerframe">#exercise#</td>
+              </tr>
+              <tr>
+                <td valign="top">&nbsp;&nbsp;<span class="style10">'.get_lang('StudentName').'</span></td>
+                '.(api_is_western_name_order() ? '<td valign="top" >#firstName# #lastName#</td>' : '<td valign="top" >#lastName# #firstName#</td>').'
+              </tr>
+              <tr>
+                <td valign="top" >&nbsp;&nbsp;'.get_lang('StudentEmail').' </td>
+                <td valign="top"> #mail#</td>
+            </tr></table>';
+
+            $msg= str_replace("#exercise#",$exerciseTitle,$msg);
+            $msg= str_replace("#firstName#",$user_info['firstname'],$msg);
+            $msg= str_replace("#lastName#",$user_info['lastname'],$msg);
+            $msg= str_replace("#mail#",$user_info['email'],$msg);
+            $msg= str_replace("#course#",$courseName,$msg);
+
+            $msg.='<br />
+                    <span class="style16">'.get_lang('ClickToCommentAndGiveFeedback').',<br />
+                    <a href="#url#">#url#</a></span></body></html>';
+
+            $msg= str_replace("#url#",$url_email,$msg);
+            $mail_content = $msg;
+
+            $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
+            $email_admin = api_get_setting('emailAdministrator');
+
+            $subject = get_lang('ExerciseAttempted');
+            $result = @api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset));
+        }
+    }
 }
 endif;
 ?>
\ No newline at end of file
diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php
index 31a5ff4a58..75d98706b3 100755
--- a/main/exercice/exercise_result.php
+++ b/main/exercice/exercise_result.php
@@ -182,6 +182,7 @@ foreach ($questionList as $questionId) {
 	$counter++;
 	// gets the student choice for this question
 	$choice                = $exerciseResult[$questionId];
+    
 	// creates a temporary Question object
 	$objQuestionTmp        = Question :: read($questionId);
 	// initialize question information
@@ -242,8 +243,7 @@ foreach ($questionList as $questionId) {
 				<?php } ?>
 				</tr>
 			<?php
-		} elseif ($answerType == FILL_IN_BLANKS) {
-			?>
+		} elseif ($answerType == FILL_IN_BLANKS) { ?>
 				<tr>
 				<td>
 					<i><?php echo get_lang("Answer"); ?></i>
diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php
index 550720df2f..1ccb40381f 100755
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@@ -12,19 +12,20 @@
  * */
 
 // name of the language file that needs to be included
-$language_file=array('exercice','tracking');
+$language_file=array('exercice');
 
-// including the global dokeos file
-require_once '../inc/global.inc.php';
-require_once '../inc/lib/course.lib.php';
 // including additional libraries
 require_once 'exercise.class.php';
 require_once 'exercise.lib.php';
 require_once 'question.class.php'; //also defines answer type constants
 require_once 'answer.class.php';
+
+require_once '../inc/global.inc.php';
+
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'exercise_show_functions.lib.php';
+
 
 if ( empty ( $origin ) ) {
     $origin = $_REQUEST['origin'];
@@ -89,21 +90,23 @@ $lp_item_view_id    = $track_exercise_info['orig_lp_item_view_id'];
 $course_code        = api_get_course_id();
 $current_user_id    = api_get_user_id();
 
-//Check if user can see the results 
+if (empty($objExercise)) {
+	$objExercise = new Exercise();
+    $objExercise->read($exercise_id);
+}
+
+if (!exercise_time_control_is_valid($exercise_id)) {
+    $sql_fraud = "UPDATE $TBL_TRACK_ATTEMPT SET answer = 0, marks=0, position=0 WHERE exe_id = $id ";
+    Database::query($sql_fraud);
+}
+
+//Only users can see their own results 
 if (!$is_allowedToEdit) {
-    if ($track_exercise_info['results_disabled']) {
-    	api_not_allowed();
-    }    
     if ($student_id != $current_user_id) {
     	api_not_allowed();
     }
 }
 
-if (!exercise_time_control_is_valid($exercise_id)) {
-	$sql_fraud = "UPDATE $TBL_TRACK_ATTEMPT SET answer = 0, marks=0, position=0 WHERE exe_id = $id ";
-	Database::query($sql_fraud);
-}
-
 //Unset session for clock time
 exercise_time_control_delete($exercise_id);
 
@@ -339,7 +342,8 @@ if ($show_results) {
 	
 	// for each question
 	$counter=0;
-	foreach($questionList as $questionId) {
+    //var_dump($exerciseResult);
+	foreach ($questionList as $questionId) {
 		$counter++;		
 		$choice=$exerciseResult[$questionId];
 		// creates a temporary Question object
@@ -361,17 +365,15 @@ if ($show_results) {
 		} else {
 			$colspan=2;
 		}
-		?>
-    	<div id="question_title" class="sectiontitle">
-    		<?php echo get_lang("Question").' '.($counter).' : '.$questionName; ?>
-    	</div>
-    	<div id="question_description">
-    		<?php echo $questionDescription; ?>
-    	</div>
-
-	 	<?php
+        
+		echo '<div id="question_title" class="sectiontitle">';
+        echo get_lang("Question").' '.($counter).' : '.$questionName; 
+    	echo '</div>';
+    	echo '<div id="question_description">';
+        echo $questionDescription; 
+    	echo '</div>';
+	 	
 		if ($answerType == MULTIPLE_ANSWER) {
-			$choice=array();
 			?>
 			<table width="100%" border="0" cellspacing="3" cellpadding="3">
 			<tr>
@@ -392,6 +394,9 @@ if ($show_results) {
 			</tr>
 			<?php
 			// construction of the Answer object
+           
+           /* $choice=array();
+                        
 			$objAnswerTmp=new Answer($questionId);
 			$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
 			$questionScore=0;
@@ -400,6 +405,7 @@ if ($show_results) {
 				$answerComment=$objAnswerTmp->selectComment($answerId);
 				$answerCorrect=$objAnswerTmp->isCorrect($answerId);
 				$answerWeighting=$objAnswerTmp->selectWeighting($answerId);
+                
 				$queryans = "select * from ".$TBL_TRACK_ATTEMPT." where exe_id = '".Database::escape_string($id)."' and question_id= '".Database::escape_string($questionId)."'";
 				$resultans = Database::query($queryans);
 				while ($row = Database::fetch_array($resultans)) {
@@ -414,13 +420,17 @@ if ($show_results) {
 				}
 				echo '<tr><td>';
 				if ($answerId==1) {
-					ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,$id,$questionId,$answerId);
+					//ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,$id,$questionId,$answerId);
 				} else {
-					ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,$id,$questionId,"");
+					//ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect,$id,$questionId,"");
 				}
 				echo '</td></tr>';
 				$i++;
-		 	}
+		 	}*/            
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);
+            //var_dump($question_result);
+            $questionScore  = $question_result['score'];
+            $totalScore     += $question_result['score'];
 		 	echo '</table>';
 		} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
 			$choice=array();
@@ -440,7 +450,7 @@ if ($show_results) {
 			</tr>
 			<?php
 			// construction of the Answer object
-			$objAnswerTmp=new Answer($questionId);
+			/*$objAnswerTmp=new Answer($questionId);
 			$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
 			$questionScore=0;
 
@@ -495,7 +505,12 @@ if ($show_results) {
 		 		$answerWeighting=$objAnswerTmp->selectWeighting(1);
 				$questionScore+=$answerWeighting;
 				$totalScore+=$answerWeighting;
-			}
+			}*/
+            
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);
+            
+            $questionScore  = $question_result['score'];
+            $totalScore    += $question_result['score'];
 
 		 	echo '</table>';
 		} elseif ($answerType == UNIQUE_ANSWER) {
@@ -518,7 +533,7 @@ if ($show_results) {
 				<td>&nbsp;</td>
 				</tr>
 			<?php
-			$objAnswerTmp=new Answer($questionId);
+			/*$objAnswerTmp=new Answer($questionId);
 			$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
 			$questionScore=0;
 			for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
@@ -545,11 +560,14 @@ if ($show_results) {
 				}
 				echo '</td></tr>';
 				$i++;
-			}
+			}*/
+            
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);
+            $questionScore  = $question_result['score'];
+            $totalScore    += $question_result['score'];  
 			echo '</table>';
 
 		} elseif ($answerType == FILL_IN_BLANKS) {
-
 			?>
 			<table width="100%" border="0" cellspacing="3" cellpadding="3">
 			<tr>
@@ -562,6 +580,7 @@ if ($show_results) {
 			<td>&nbsp;</td>
 			</tr>
 			<?php
+            /*
 			$objAnswerTmp=new Answer($questionId);
 			$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
 			$questionScore=0;
@@ -599,17 +618,7 @@ if ($show_results) {
 			    //$temp=$answer;
 			    $temp = text_filter($answer);
 
-			    /* // Deprecated code
-				// TeX parsing
-				// 1. find everything between the [tex] and [/tex] tags
-				$startlocations=api_strpos($temp,'[tex]');
-				$endlocations=api_strpos($temp,'[/tex]');
-				if ($startlocations !== false && $endlocations !== false) {
-					$texstring=api_substr($temp,$startlocations,$endlocations-$startlocations+6);
-					// 2. replace this by {texcode}
-					$temp=str_replace($texstring,'{texcode}',$temp);
-				}
-				*/
+
 
 				$j=0;
 				// the loop will stop at the end of the text
@@ -622,10 +631,7 @@ if ($show_results) {
 						if (($pos = api_strpos($temp,'[')) === false) {
 							// adds the end of the text
 							$answer.=$temp;
-							/* // Deprecated code
-							// TeX parsing
-							$texstring = api_parse_tex($texstring);
-							*/
+		
 							break;
 						}
 					    $temp=api_substr($temp,$pos+1);
@@ -673,11 +679,7 @@ if ($show_results) {
 						if (($pos = api_strpos($temp,'[')) === false) {
 							// adds the end of the text
 							$answer.=$temp;
-							/* // Deprecated code
-							// TeX parsing
-							$texstring = api_parse_tex($texstring);
-							//$answer=str_replace("{texcode}",$texstring,$answer);
-							*/
+
 							break;
 						}
 						// adds the piece of text that is before the blank and ended by [
@@ -723,9 +725,15 @@ if ($show_results) {
 				ExerciseShowFunctions::display_fill_in_blanks_answer($answer,$id,$questionId);
 				echo '</td></tr>';
 				$i++;
-			}
+			}*/
+            
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);
+            $questionScore  = $question_result['score'];
+            $totalScore    += $question_result['score'];
+              
 			echo '</table>';
-		} elseif ($answerType == FREE_ANSWER) {$answer = $str;
+		} elseif ($answerType == FREE_ANSWER) {
+            $answer = $str;
 			?>
 			<table width="100%" border="0" cellspacing="3" cellpadding="3">
 			<tr>
@@ -739,7 +747,8 @@ if ($show_results) {
 			</tr>
 
 			<?php
-			$objAnswerTmp = new Answer($questionId);
+			
+           /* $objAnswerTmp = new Answer($questionId);
 			$nbrAnswers = $objAnswerTmp->selectNbrAnswers();
 			$questionScore = 0;
 			$query 	= "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." WHERE exe_id = '".Database::escape_string($id)."' AND question_id= '".Database::escape_string($questionId)."'";
@@ -756,112 +765,34 @@ if ($show_results) {
 			}
 
 			$arrques[] = $questionName;
-            $arrans[]  = $choice;
-
-			echo '<tr>
+            $arrans[]  = $choice;*/
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);            
+            $questionScore  = $question_result['score'];
+            $totalScore    += $question_result['score'];
+            
+			/*echo '<tr>
 			<td valign="top">'.ExerciseShowFunctions::display_free_answer($choice, $id, $questionId).'</td>
 			</tr>
-			</table>';
-
-		} elseif ($answerType == MATCHING) {
-
-			$objAnswerTmp=new Answer($questionId);
-			$table_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER);
-			$TBL_TRACK_ATTEMPT= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-			$sql_answer = 'SELECT id, answer FROM '.$table_ans.' WHERE question_id="'.Database::escape_string($questionId).'" AND correct=0';
-			$res_answer = Database::query($sql_answer);
-			// getting the real answer
-			$real_list =array();
-			while ($real_answer = Database::fetch_array($res_answer)) {
-				$real_list[$real_answer['id']]= $real_answer['answer'];
-			}
-
-			$sql_select_answer = 'SELECT id, answer, correct, id_auto FROM '.$table_ans.'
-								  WHERE question_id="'.Database::escape_string($questionId).'" AND correct <> 0 ORDER BY id_auto';
+			</table>';*/
 
-			$res_answers = Database::query($sql_select_answer);
-
-			echo '<table width="100%" height="71" border="0" cellspacing="3" cellpadding="3" >';
-			echo '<tr><td colspan="2">&nbsp;</td></tr>';
-			echo '<tr>
-					<td><span style="font-style: italic;">'.get_lang('ElementList').'</span> </td>
-					<td><span style="font-style: italic;">'.get_lang('CorrespondsTo').'</span></td>
-				  </tr>';
-			echo '<tr><td colspan="2">&nbsp;</td></tr>';
-
-			$questionScore = 0;
-
-			while ($a_answers = Database::fetch_array($res_answers)) {
-
-				$i_answer_id 	= $a_answers['id']; //3
-				$s_answer_label = $a_answers['answer'];  // your daddy - your mother
-				$i_answer_correct_answer = $a_answers['correct']; //1 - 2
-				$i_answer_id_auto = $a_answers['id_auto']; // 3 - 4
-
-				$sql_user_answer = "SELECT answer FROM $TBL_TRACK_ATTEMPT
-									WHERE exe_id = '$id' AND question_id = '$questionId' AND position='$i_answer_id_auto'";
-
-				$res_user_answer = Database::query($sql_user_answer);
-
-				if (Database::num_rows($res_user_answer)>0 ) {
-					$s_user_answer = Database::result($res_user_answer,0,0); //  rich - good looking
-				} else {
-					$s_user_answer = 0;
-				}
-
-				$i_answerWeighting=$objAnswerTmp->selectWeighting($i_answer_id);
-
-				$user_answer = '';
-
-				if (!empty($s_user_answer)) {
-					if ($s_user_answer == $i_answer_correct_answer)	{
-						$questionScore	+= $i_answerWeighting;
-						$totalScore		+= $i_answerWeighting;
-						$user_answer = '<span>'.$real_list[$i_answer_correct_answer].'</span>';
-					} else {
-						$user_answer = '<span style="color: #FF0000; text-decoration: line-through;">'.$real_list[$s_user_answer].'</span>';
-					}
-				}
-				echo '<tr>';
-				echo '<td>'.$s_answer_label.'</td><td>'.$user_answer.' / <b><span style="color: #008000;">'.$real_list[$i_answer_correct_answer].'</span></b></td>';
-				echo '</tr>';
-			}
+		} elseif ($answerType == MATCHING) {            
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);            
+            $questionScore  = $question_result['score'];
+            $totalScore    += $question_result['score'];			
 			echo '</table>';
 		} elseif ($answerType == HOT_SPOT) {
-			?>
-			<table width="500" border="0">
-
-			<?php
-			$objAnswerTmp=new Answer($questionId);
-			$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
-			$questionScore=0;
-			?>
-				<tr>
-					<td valign="top" align="center" style="padding-left:0px;" >
-						<table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">
-			<?php
-			for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-				$answer=$objAnswerTmp->selectAnswer($answerId);
-				$answerComment=$objAnswerTmp->selectComment($answerId);
-				$answerCorrect=$objAnswerTmp->isCorrect($answerId);
-				$answerWeighting=$objAnswerTmp->selectWeighting($answerId);
-
-				$TBL_TRACK_HOTSPOT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
-				$query = "select hotspot_correct from ".$TBL_TRACK_HOTSPOT." where hotspot_exe_id = '".Database::escape_string($id)."' and hotspot_question_id= '".Database::escape_string($questionId)."' AND hotspot_answer_id='".Database::escape_string($answerId)."'";
-				$resq=Database::query($query);
-				$choice = Database::result($resq,0,"hotspot_correct");
-				ExerciseShowFunctions::display_hotspot_answer($answerId,$answer,$choice,$answerComment);
-				$i++;
-		 	}
-		 	$queryfree = "select marks from ".$TBL_TRACK_ATTEMPT." where exe_id = '".Database::escape_string($id)."' and question_id= '".Database::escape_string($questionId)."'";
-			$resfree = Database::query($queryfree);
-			$questionScore= Database::result($resfree,0,"marks");
-			$totalScore+=$questionScore;
-			echo '</table></td></tr>';
+			
+			echo '<table width="500" border="0">
+            <tr>
+                    <td valign="top" align="center" style="padding-left:0px;" >
+                        <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';			
+            $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', false, true);            
+            $questionScore  = $question_result['score'];
+            $totalScore    += $question_result['score'];
+			echo '</table></td></tr>';            
 		 	echo '<tr>
 				<td colspan="2">'.
-					//<object type="application/x-shockwave-flash" data="../plugin/hotspot/hotspot_solution.swf?modifyAnswers='.$questionId.'&exe_id='.$id.'&from_db=1" width="556" height="421">
-					'<object type="application/x-shockwave-flash" data="../plugin/hotspot/hotspot_solution.swf?modifyAnswers='.Security::remove_XSS($questionId).'&exe_id='.$id.'&from_db=1" width="552" height="352">
+					'<object type="application/x-shockwave-flash" data="'.api_get_path(WEB_CODE_PATH).'plugin/hotspot/hotspot_solution.swf?modifyAnswers='.Security::remove_XSS($questionId).'&exe_id='.$id.'&from_db=1" width="552" height="352">
 						<param name="movie" value="../plugin/hotspot/hotspot_solution.swf?modifyAnswers='.Security::remove_XSS($questionId).'&exe_id='.$id.'&from_db=1" />
 					</object>
 
@@ -889,7 +820,7 @@ if ($show_results) {
 				}
 			}
 			echo '</a><br /><div id="feedback_'.$name.'" style="width:100%">';
-			$comnt = trim(ExerciseShowFunctions::get_comments($id,$questionId));
+			$comnt = trim(get_comments($id,$questionId));
 			if (empty($comnt)) {
 				echo '<br />';
 			} else {
@@ -903,7 +834,7 @@ if ($show_results) {
 			$renderer =& $feedback_form->defaultRenderer();
 			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
 			$renderer->setElementTemplate('<div align="left">{element}</div>');
-			$comnt = ExerciseShowFunctions::get_comments($id,$questionId);
+			$comnt = get_comments($id,$questionId);
 			${user.$questionId}['comments_'.$questionId] = $comnt;
 			$feedback_form->addElement('html_editor', 'comments_'.$questionId, null, null, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '100%', 'Height' => '120'));
 			$feedback_form->addElement('html','<br>');
@@ -912,7 +843,7 @@ if ($show_results) {
 			$feedback_form->display();
 			echo '</div>';
 		} else {
-			$comnt = ExerciseShowFunctions::get_comments($id,$questionId);
+			$comnt = get_comments($id,$questionId);
 			echo '<tr><td><br />';
 			if (!empty($comnt)) {
 				echo '<b>'.get_lang('Feedback').'</b>';
@@ -958,7 +889,7 @@ if ($show_results) {
 		$my_total_weight = float_format($questionWeighting,1);
 
 		echo '<div id="question_score">';
-		echo get_lang('YourTotalScore')." : $my_total_score/$my_total_weight";
+		echo get_lang('Score')." : $my_total_score/$my_total_weight";
 		echo '</div>';
 
 		unset($objAnswerTmp);
@@ -971,12 +902,14 @@ if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type'])))
 	//$query = "update ".$TBL_TRACK_EXERCICES." set exe_result = $totalScore where exe_id = '$id'";
 	//Database::query($query);
 	if ($show_results) {
+        
 		echo '<div id="question_score">'.get_lang('YourTotalScore')." ";
-		if ($dsp_percent) {
+		if ($dsp_percent) {            
 			$my_result = number_format(($totalScore/$totalWeighting)*100,1,'.','');
 			$my_result = float_format($my_result,1);
 			echo $my_result."%";
-		} else {
+		} else {            
+            
 			$my_total_score  = float_format($totalScore,1);
 			$my_total_weight = float_format($totalWeighting,1);
 			echo $my_total_score."/".$my_total_weight;
@@ -1038,7 +971,7 @@ if ($origin != 'learnpath') {
 		echo '</body></html>';
 	} else {
 		if (!$is_allowedToEdit) {
-			ExerciseShowFunctions::send_notification($arrques, $arrans, $to);
+			$objExercise->send_notification($arrques, $arrans, $to);
 		}
 		Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
         echo '<br />';
@@ -1047,7 +980,7 @@ if ($origin != 'learnpath') {
 
 if (!$is_allowedToEdit) {
 	if ($origin != 'learnpath') {
- 		ExerciseShowFunctions::send_notification($arrques, $arrans, $to);
+ 		$objExercise->send_notification($arrques, $arrans, $to);
 	}
 }
 
diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php
index 2ad3b0d86f..98b8e5d394 100755
--- a/main/inc/lib/events.lib.inc.php
+++ b/main/inc/lib/events.lib.inc.php
@@ -772,3 +772,20 @@ function get_all_exercises_from_lp($lp_id, $course_db) {
 	return $my_exercise_list; 
 }
 
+
+/**
+ * This function gets the comments of an exercise
+ *
+ * @param int $id
+ * @param int $question_id
+ * @return str the comment
+ */
+function get_comments($id,$question_id)
+{
+    $TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+    $sql = "SELECT teacher_comment FROM ".$TBL_TRACK_ATTEMPT." where exe_id='".Database::escape_string($id)."' and question_id = '".Database::escape_string($question_id)."' ORDER by question_id";
+    $sqlres = Database::query($sql);
+    $comm = Database::result($sqlres,0,"teacher_comment");
+    return $comm;
+}
+
diff --git a/main/inc/lib/exercise_show_functions.lib.php b/main/inc/lib/exercise_show_functions.lib.php
index aa152362f5..21fdd1f858 100755
--- a/main/inc/lib/exercise_show_functions.lib.php
+++ b/main/inc/lib/exercise_show_functions.lib.php
@@ -12,15 +12,6 @@
 * @todo convert queries to use Database API
 */
 
-$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_REPONSES          	= Database::get_course_table(TABLE_QUIZ_ANSWER);
-$main_user_table 		= Database :: get_main_table(TABLE_MAIN_USER);
-$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-$TBL_TRACK_EXERCICES	= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
-$TBL_TRACK_ATTEMPT		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-
 class ExerciseShowFunctions {
 
 	/**
@@ -46,7 +37,7 @@ class ExerciseShowFunctions {
 			if(!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {?>
 				<td>
 				<?php
-				$comm = ExerciseShowFunctions::get_comments($id,$questionId);
+				$comm = get_comments($id,$questionId);
 				?>
 				</td>
 			<?php } ?>
@@ -91,7 +82,7 @@ class ExerciseShowFunctions {
 			<?php if(!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {?>
 	        <td>
 	        <?php
-	        $comm = ExerciseShowFunctions::get_comments($id,$questionId);
+	        $comm = get_comments($id,$questionId);
 	        ?>
 	        </td>
 	    	<?php }?>
@@ -174,8 +165,7 @@ class ExerciseShowFunctions {
 	 * @param boolean Whether to show the answer comment or not
 	 * @return void
 	 */
-	function display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect, $id, $questionId, $ans)
-	{
+	function display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect, $id, $questionId, $ans) {
 		global $feedback_type;
 		?>
 		<tr>
@@ -216,7 +206,7 @@ class ExerciseShowFunctions {
 		</td>
 			<?php
 		    if ($ans==1) {
-		        $comm = ExerciseShowFunctions::get_comments($id,$questionId);
+		        $comm = get_comments($id,$questionId);
 			}
 		    ?>
 		 <?php } else { ?>
@@ -224,142 +214,5 @@ class ExerciseShowFunctions {
 		<?php } ?>
 		</tr>
 		<?php
-	}
-
-	/**
-	 * This function gets the comments of an exercise
-	 *
-	 * @param int $id
-	 * @param int $question_id
-	 * @return str the comment
-	 */
-	function get_comments($id,$question_id)
-	{
-		global $TBL_TRACK_ATTEMPT;
-		$sql = "SELECT teacher_comment FROM ".$TBL_TRACK_ATTEMPT." where exe_id='".Database::escape_string($id)."' and question_id = '".Database::escape_string($question_id)."' ORDER by question_id";
-		$sqlres = Database::query($sql);
-		$comm = Database::result($sqlres,0,"teacher_comment");
-		return $comm;
-	}
-
-	function send_notification($arrques, $arrans, $to) {
-		global $courseName, $exerciseTitle, $url_email;
-	    require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-		$user_info = UserManager::get_user_info_by_id(api_get_user_id());
-
-		if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
-			return '';
-		}
-
-		$mycharset = api_get_system_encoding();
-	    $msg = '<html><head>
-	            <link rel="stylesheet" href="'.api_get_path(WEB_CODE_PATH).'css/'.api_get_setting('stylesheets').'/default.css" type="text/css">
-	            <meta content="text/html; charset='.$mycharset.'" http-equiv="content-type"></head>';
-		if(count($arrques)>0) {
-		    $msg .= '<body>
-		    <p>'.get_lang('OpenQuestionsAttempted').' :
-		    </p>
-		    <p>'.get_lang('AttemptDetails').' : <br />
-		    </p>
-		    <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">
-		                                            <tr>
-		        <td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td>
-		        <td width="469" valign="top"><h2>#course#</h2></td>
-		      </tr>
-		      <tr>
-		        <td width="229" valign="top" class="outerframe">&nbsp;&nbsp;'.get_lang('TestAttempted').'</span></td>
-		        <td width="469" valign="top" class="outerframe">#exercise#</td>
-		      </tr>
-		      <tr>
-		        <td valign="top">&nbsp;&nbsp;<span class="style10">'.get_lang('StudentName').'</span></td>
-		        <td valign="top" >#firstName# #lastName#</td>
-		      </tr>
-		      <tr>
-		        <td valign="top" >&nbsp;&nbsp;'.get_lang('StudentEmail').' </td>
-		        <td valign="top"> #mail#</td>
-		    </tr></table>
-		    <p><br />'.get_lang('OpenQuestionsAttemptedAre').' :</p>
-		     <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">';
-
-		    for($i=0;$i<sizeof($arrques);$i++) {
-		              $msg.='
-		                    <tr>
-		                <td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;<span class="style10">'.get_lang('Question').'</span></td>
-		                <td width="473" valign="top" bgcolor="#F3F3F3"><span class="style16"> #questionName#</span></td>
-		                    </tr>
-		                    <tr>
-		                <td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;<span class="style10">'.get_lang('Answer').' </span></td>
-		                <td valign="top" bgcolor="#F3F3F3"><span class="style16"> #answer#</span></td>
-		                    </tr>';
-
-		                    $msg1= str_replace("#exercise#",$exerciseTitle,$msg);
-		                    $msg= str_replace("#firstName#",$user_info['firstname'],$msg1);
-		                    $msg1= str_replace("#lastName#",$user_info['lastname'],$msg);
-		                    $msg= str_replace("#mail#",$user_info['email'],$msg1);
-		                    $msg1= str_replace("#questionName#",$arrques[$i],$msg);
-		                    $msg= str_replace("#answer#",$arrans[$i],$msg1);
-		                    $msg1= str_replace("#i#",$i,$msg);
-		                    $msg= str_replace("#course#",$courseName,$msg1);
-		    }
-		    $msg.='</table><br>
-		                    <span class="style16">'.get_lang('ClickToCommentAndGiveFeedback').',<br />
-		                    <a href="#url#">#url#</a></span></body></html>';
-
-		    $msg1= str_replace("#url#",$url_email,$msg);
-		    $mail_content = $msg1;
-
-		    $subject = get_lang('OpenQuestionsAttempted');
-
-
-		    $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
-		    $email_admin = api_get_setting('emailAdministrator');
-		    $result = @api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset));
-		} else {
-
-			$msg .= '<body>
-			<p>'.get_lang('ExerciseAttempted').' <br />
-		    </p>
-			<table width="730" height="136" border="0" cellpadding="3" cellspacing="3">
-				<tr>
-			    <td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td>
-			    <td width="469" valign="top"><h2>#course#</h2></td>
-			  </tr>
-			  <tr>
-			    <td width="229" valign="top" class="outerframe">&nbsp;&nbsp;'.get_lang('TestAttempted').'</span></td>
-			    <td width="469" valign="top" class="outerframe">#exercise#</td>
-			  </tr>
-			  <tr>
-			    <td valign="top">&nbsp;&nbsp;<span class="style10">'.get_lang('StudentName').'</span></td>
-			    '.(api_is_western_name_order() ? '<td valign="top" >#firstName# #lastName#</td>' : '<td valign="top" >#lastName# #firstName#</td>').'
-			  </tr>
-			  <tr>
-			    <td valign="top" >&nbsp;&nbsp;'.get_lang('StudentEmail').' </td>
-			    <td valign="top"> #mail#</td>
-			</tr></table>';
-
-			$msg= str_replace("#exercise#",$exerciseTitle,$msg);
-			$msg= str_replace("#firstName#",$user_info['firstname'],$msg);
-			$msg= str_replace("#lastName#",$user_info['lastname'],$msg);
-			$msg= str_replace("#mail#",$user_info['email'],$msg);
-			$msg= str_replace("#course#",$courseName,$msg);
-
-			$msg.='<br />
-		 			<span class="style16">'.get_lang('ClickToCommentAndGiveFeedback').',<br />
-					<a href="#url#">#url#</a></span></body></html>';
-
-			$msg= str_replace("#url#",$url_email,$msg);
-			$mail_content = $msg;
-
-			$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
-			$email_admin = api_get_setting('emailAdministrator');
-
-			$subject = get_lang('ExerciseAttempted');
-			$result = @api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset));
-		}
-	}
-    
-    
-    
-    
-    
+	}   
 }
\ No newline at end of file