Sfoglia il codice sorgente

Fix PHP mysql error, when resolving an exercise

Julio 7 anni fa
parent
commit
57cd87eef8
2 ha cambiato i file con 8 aggiunte e 10 eliminazioni
  1. 3 4
      main/exercise/TestCategory.php
  2. 5 6
      main/exercise/exercise.class.php

+ 3 - 4
main/exercise/TestCategory.php

@@ -369,18 +369,17 @@ class TestCategory
 
     /**
      * Return the list of different categories NAME for a test
-     * @param int exercise id
+     * @param int $exerciseId
      * @param bool
      * @return array
      *
      * @author function rewrote by jmontoya
      */
-    public static function getListOfCategoriesNameForTest($exercise_id, $grouped_by_category = true)
+    public static function getListOfCategoriesNameForTest($exerciseId, $grouped_by_category = true)
     {
         $result = array();
         $categories = self::getListOfCategoriesIDForTest(
-            $exercise_id,
-            $grouped_by_category
+            $exerciseId
         );
 
         foreach ($categories as $catInfo) {

+ 5 - 6
main/exercise/exercise.class.php

@@ -619,8 +619,7 @@ class Exercise
                     FROM $TBL_EXERCICE_QUESTION e 
                     INNER JOIN $TBL_QUESTIONS  q
                     ON (e.question_id = q.id AND e.c_id = ".$this->course_id." )
-					WHERE e.exercice_id	= '".Database::escape_string($this->id)."'
-					";
+					WHERE e.exercice_id	= '".$this->id."' ";
 
             $orderCondition = "ORDER BY question_order";
 
@@ -715,7 +714,7 @@ class Exercise
                 ON (e.question_id = q.id AND e.c_id = q.c_id)
                 WHERE 
                     e.c_id = {$this->course_id} AND 
-                    e.exercice_id = ".Database::escape_string($this->id);
+                    e.exercice_id = ".$this->id;
         $result = Database::query($sql);
 
         $count = 0;
@@ -742,7 +741,7 @@ class Exercise
                 ON (e.question_id= q.id AND e.c_id = q.c_id)
                 WHERE 
                     e.c_id = {$this->course_id} AND 
-                    e.exercice_id = '".Database::escape_string($this->id)."'
+                    e.exercice_id = '".$this->id."'
                 ORDER BY q.question";
         $result = Database::query($sql);
         $list = array();
@@ -770,7 +769,7 @@ class Exercise
                 ON (e.question_id = q.id AND e.c_id = q.c_id)
                 WHERE
                   e.c_id = {$this->course_id} AND
-                  e.exercice_id	= ".Database::escape_string($this->id);
+                  e.exercice_id	= ".$this->id;
 
         $result = Database::query($sql);
         $count_question_orders = Database::num_rows($result);
@@ -782,7 +781,7 @@ class Exercise
                 ON (e.question_id = q.id AND e.c_id = q.c_id)
                 WHERE
                     e.c_id = {$this->course_id} AND
-                    e.exercice_id	= '".Database::escape_string($this->id)."'
+                    e.exercice_id = '".$this->id."'
                 ORDER BY question_order";
 
         $result = Database::query($sql);