You attempt for the test #test# has been viewed/commented/correct //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 - FROM $TBL_EXERCICES AS ce , `$TBL_TRACK_EXERCICES` AS te, $TBL_USER AS user + FROM $TBL_EXERCICES AS ce , $TBL_TRACK_EXERCICES AS te, $TBL_USER AS user WHERE `te`.`exe_exo_id` = `ce`.`id` AND `user_id`=`te`.`exe_user_id` AND `te`.`exe_cours_id`='$_cid' ORDER BY `te`.`exe_cours_id` ASC, `ce`.`title` ASC, `te`.`exe_date`ASC"; @@ -839,7 +839,7 @@ $message = "
You attempt for the test #test# has been viewed/commented/correct else { // get only this user's results $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 + FROM $TBL_EXERCICES AS ce , $TBL_TRACK_EXERCICES AS te WHERE `te`.`exe_exo_id` = `ce`.`id` AND `te`.`exe_user_id`='".$_user['user_id']."' AND `te`.`exe_cours_id`='$_cid' ORDER BY `te`.`exe_cours_id` ASC, `ce`.`title` ASC, `te`.`exe_date`ASC"; diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php index 8c8bfeac65..4502faac73 100644 --- a/main/exercice/question.class.php +++ b/main/exercice/question.class.php @@ -22,7 +22,7 @@ * File containing the Question class. * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: question.class.php 10791 2007-01-19 09:02:48Z elixir_inter $ +* @version $Id: question.class.php 10793 2007-01-19 09:17:15Z elixir_inter $ */ @@ -120,7 +120,7 @@ abstract class Question $objQuestion->type=$object->type; $objQuestion->picture=$object->picture; - $sql="SELECT exercice_id FROM `$TBL_EXERCICE_QUESTION` WHERE question_id='".intval($id)."'"; + $sql="SELECT exercice_id FROM $TBL_EXERCICE_QUESTION WHERE question_id='".intval($id)."'"; $result=api_sql_query($sql,__FILE__,__LINE__); // fills the array with the exercises which this question is in @@ -299,7 +299,7 @@ abstract class Question if(!in_array($this->type,array(UNIQUE_ANSWER,MULTIPLE_ANSWER)) || !in_array($type,array(UNIQUE_ANSWER,MULTIPLE_ANSWER))) { // removes old answers - $sql="DELETE FROM `$TBL_REPONSES` WHERE question_id='".$this->id."'"; + $sql="DELETE FROM $TBL_REPONSES WHERE question_id='".$this->id."'"; api_sql_query($sql,__FILE__,__LINE__); } @@ -592,7 +592,7 @@ abstract class Question { $this->exerciseList[]=$exerciseId; - $sql="INSERT INTO `$TBL_EXERCICE_QUESTION`(question_id,exercice_id) VALUES('$id','$exerciseId')"; + $sql="INSERT INTO $TBL_EXERCICE_QUESTION(question_id,exercice_id) VALUES('$id','$exerciseId')"; api_sql_query($sql,__FILE__,__LINE__); } @@ -624,7 +624,7 @@ abstract class Question // deletes the position in the array containing the wanted exercise ID unset($this->exerciseList[$pos]); - $sql="DELETE FROM `$TBL_EXERCICE_QUESTION` WHERE question_id='$id' AND exercice_id='$exerciseId'"; + $sql="DELETE FROM $TBL_EXERCICE_QUESTION WHERE question_id='$id' AND exercice_id='$exerciseId'"; api_sql_query($sql,__FILE__,__LINE__); return true; @@ -648,13 +648,13 @@ abstract class Question // if the question must be removed from all exercises if(!$deleteFromEx) { - $sql="DELETE FROM `$TBL_EXERCICE_QUESTION` WHERE question_id='$id'"; + $sql="DELETE FROM $TBL_EXERCICE_QUESTION WHERE question_id='$id'"; api_sql_query($sql,__FILE__,__LINE__); $sql="DELETE FROM $TBL_QUESTIONS WHERE id='$id'"; api_sql_query($sql,__FILE__,__LINE__); - $sql="DELETE FROM `$TBL_REPONSES` WHERE question_id='$id'"; + $sql="DELETE FROM $TBL_REPONSES WHERE question_id='$id'"; api_sql_query($sql,__FILE__,__LINE__); $this->removePicture(); diff --git a/main/exercice/question_pool.php b/main/exercice/question_pool.php index 4b882d0b0d..f78f2aca6e 100644 --- a/main/exercice/question_pool.php +++ b/main/exercice/question_pool.php @@ -24,7 +24,7 @@ * One question can be in several exercises * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: question_pool.php 10791 2007-01-19 09:02:48Z elixir_inter $ +* @version $Id: question_pool.php 10793 2007-01-19 09:17:15Z elixir_inter $ */ // name of the language file that needs to be included @@ -152,19 +152,19 @@ if($is_allowedToEdit) // if we have selected an exercise in the list-box 'Filter' if($exerciseId > 0) { - $sql="SELECT id,question,type FROM `$TBL_EXERCICE_QUESTION`,$TBL_QUESTIONS WHERE question_id=id AND exercice_id='$exerciseId' ORDER BY position LIMIT $from,".($limitQuestPage+1); + $sql="SELECT id,question,type FROM $TBL_EXERCICE_QUESTION,$TBL_QUESTIONS WHERE question_id=id AND exercice_id='$exerciseId' ORDER BY position LIMIT $from,".($limitQuestPage+1); $result=api_sql_query($sql,__FILE__,__LINE__); } // if we have selected the option 'Orphan questions' in the list-box 'Filter' elseif($exerciseId == -1) { - $sql="SELECT id,question,type FROM $TBL_QUESTIONS LEFT JOIN `$TBL_EXERCICE_QUESTION` ON question_id=id WHERE exercice_id IS NULL ORDER BY question LIMIT $from,".($limitQuestPage+1); + $sql="SELECT id,question,type FROM $TBL_QUESTIONS LEFT JOIN $TBL_EXERCICE_QUESTION ON question_id=id WHERE exercice_id IS NULL ORDER BY question LIMIT $from,".($limitQuestPage+1); $result=api_sql_query($sql,__FILE__,__LINE__); } // if we have not selected any option in the list-box 'Filter' else { - $sql="SELECT id,question,type FROM $TBL_QUESTIONS LEFT JOIN `$TBL_EXERCICE_QUESTION` ON question_id=id WHERE exercice_id IS NULL OR exercice_id<>'$fromExercise' GROUP BY id ORDER BY question LIMIT $from,".($limitQuestPage+1); + $sql="SELECT id,question,type FROM $TBL_QUESTIONS LEFT JOIN $TBL_EXERCICE_QUESTION ON question_id=id WHERE exercice_id IS NULL OR exercice_id<>'$fromExercise' GROUP BY id ORDER BY question LIMIT $from,".($limitQuestPage+1); $result=api_sql_query($sql,__FILE__,__LINE__); // forces the value to 0