Jelajahi Sumber

Minor - Format code.

Julio Montoya 10 tahun lalu
induk
melakukan
6606c5909c

+ 1 - 2
main/exercice/addlimits.php

@@ -18,8 +18,7 @@ api_protect_course_script();
 
 $dsp_percent = false;
 $debug=0;
-if($debug>0)
-{
+if($debug>0) {
 	echo str_repeat('&nbsp;',0).'Entered exercise_result.php'."<br />\n";var_dump($_POST);
 }
 // general parameters passed via POST/GET

+ 4 - 4
main/exercice/admin.php

@@ -212,12 +212,12 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
                 api_not_allowed();
             }
             // saves the object into the session
-            Session::write('objQuestion',$objQuestion);
+            Session::write('objQuestion', $objQuestion);
         }
     }
 
     // checks if the object exists
-    if(is_object($objQuestion)) {
+    if (is_object($objQuestion)) {
         // gets the question ID
         $questionId = $objQuestion->selectId();
     }
@@ -226,7 +226,7 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
 // if cancelling an exercise
 if ($cancelExercise) {
     // existing exercise
-    if($exerciseId) {
+    if ($exerciseId) {
         unset($modifyExercise);
     } else {
         // new exercise
@@ -239,7 +239,7 @@ if ($cancelExercise) {
 // if cancelling question creation/modification
 if ($cancelQuestion) {
     // if we are creating a new question from the question pool
-    if(!$exerciseId && !$questionId) {
+    if (!$exerciseId && !$questionId) {
         // goes back to the question pool
         header('Location: question_pool.php');
         exit();

+ 28 - 23
main/exercice/exercise.class.php

@@ -915,7 +915,10 @@ class Exercise
             foreach ($question_list as $position => $questionId) {
                 $sql = "UPDATE $quiz_question_table SET
                         question_order ='".intval($position)."'
-                        WHERE c_id = ".$this->course_id." AND question_id = ".intval($questionId)." AND exercice_id=".intval($this->id);
+                        WHERE
+                            c_id = ".$this->course_id." AND
+                            question_id = ".intval($questionId)." AND
+                            exercice_id=".intval($this->id);
                 Database::query($sql);
             }
         }
@@ -1768,8 +1771,6 @@ class Exercise
         $safe_lp_item_id = intval($safe_lp_item_id);
         $safe_lp_item_view_id = intval($safe_lp_item_view_id);
 
-        $trackValues = array();
-
         if (empty($safe_lp_id)) {
             $safe_lp_id = 0;
         }
@@ -1802,6 +1803,7 @@ class Exercise
         }
 
         $id = Database::insert($track_exercises, $params);
+
         return $id;
     }
 
@@ -2164,33 +2166,35 @@ class Exercise
         $table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
 
         // Creates a temporary Question object
-        $course_id              = api_get_course_int_id();
-        $objQuestionTmp         = Question::read($questionId, $course_id);
+        $course_id = api_get_course_int_id();
+        $objQuestionTmp = Question::read($questionId, $course_id);
 
         if ($objQuestionTmp === false) {
             return false;
         }
 
-        $questionName 			= $objQuestionTmp->selectTitle();
-        $questionWeighting 		= $objQuestionTmp->selectWeighting();
-        $answerType 			= $objQuestionTmp->selectType();
-        $quesId 				= $objQuestionTmp->selectId();
-        $extra                  = $objQuestionTmp->extra;
+        $questionName = $objQuestionTmp->selectTitle();
+        $questionWeighting = $objQuestionTmp->selectWeighting();
+        $answerType = $objQuestionTmp->selectType();
+        $quesId = $objQuestionTmp->selectId();
+        $extra = $objQuestionTmp->extra;
 
         $next = 1; //not for now
 
         // Extra information of the question
         if (!empty($extra)) {
             $extra = explode(':', $extra);
-            if ($debug) error_log(print_r($extra, 1));
+            if ($debug) {
+                error_log(print_r($extra, 1));
+            }
             // Fixes problems with negatives values using intval
-            $true_score     = floatval(trim($extra[0]));
-            $false_score    = floatval(trim($extra[1]));
-            $doubt_score    = floatval(trim($extra[2]));
+            $true_score = floatval(trim($extra[0]));
+            $false_score = floatval(trim($extra[1]));
+            $doubt_score = floatval(trim($extra[2]));
         }
 
-        $totalWeighting 		= 0;
-        $totalScore				= 0;
+        $totalWeighting = 0;
+        $totalScore = 0;
 
         // Destruction of the Question object
         unset($objQuestionTmp);
@@ -2215,12 +2219,12 @@ class Exercise
             $exe_info = isset($exe_info[$exeId]) ? $exe_info[$exeId] : null;
 
             $params = array();
-            $params['course_id'] 	= api_get_course_int_id();
-            $params['session_id'] 	= api_get_session_id();
-            $params['user_id'] 		= isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
-            $params['exercise_id']  = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
-            $params['question_id'] 	= $questionId;
-            $params['exe_id'] 		= isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
+            $params['course_id'] = api_get_course_int_id();
+            $params['session_id'] = api_get_session_id();
+            $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
+            $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
+            $params['question_id'] = $questionId;
+            $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
 
             $nano = new Nanogong($params);
 
@@ -2239,7 +2243,7 @@ class Exercise
 
         $answer_matching =array();
         while ($real_answer = Database::fetch_array($res_answer)) {
-            $answer_matching[$real_answer['id']]= $real_answer['answer'];
+            $answer_matching[$real_answer['id']] = $real_answer['answer'];
         }
 
         $real_answers = array();
@@ -2258,6 +2262,7 @@ class Exercise
             $answerCorrect = $objAnswerTmp->isCorrect($answerId);
             $answerWeighting = (float)$objAnswerTmp->selectWeighting($answerId);
             $numAnswer = $objAnswerTmp->selectAutoId($answerId);
+
             $answer_correct_array[$answerId] = (bool)$answerCorrect;
 
             if ($debug) {

+ 51 - 35
main/exercice/question.class.php

@@ -73,12 +73,16 @@ abstract class Question
         $this->parent_id = 0;
     }
 
+    /**
+     * @return int|null
+     */
     public function getIsContent()
     {
         $isContent = null;
         if (isset($_REQUEST['isContent'])) {
             $isContent = intval($_REQUEST['isContent']);
         }
+
         return $this->isContent = $isContent;
     }
 
@@ -86,7 +90,8 @@ abstract class Question
      * Reads question information from the data base
      *
      * @author Olivier Brouckaert
-     * @param integer $id - question ID
+     * @param int $id - question ID
+     * @param int $course_id
      *
      * @return Question
      */
@@ -106,11 +111,12 @@ abstract class Question
             return false;
         }
 
-        $TBL_QUESTIONS         = Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
         $TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
 
         $sql = "SELECT question,description,ponderation,position,type,picture,level,extra
-                FROM $TBL_QUESTIONS WHERE c_id = $course_id AND id = $id ";
+                FROM $TBL_QUESTIONS
+                WHERE c_id = $course_id AND id = $id ";
 
         $result = Database::query($sql);
 
@@ -713,21 +719,20 @@ abstract class Question
      */
     public function save($exerciseId = 0)
     {
-        $TBL_EXERCICE_QUESTION	= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
-        $TBL_QUESTIONS			= Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
+        $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
 
-        $id			= $this->id;
-        $question	= $this->question;
+        $id = $this->id;
+        $question = $this->question;
         $description = $this->description;
-        $weighting	= $this->weighting;
-        $position	= $this->position;
-        $type		= $this->type;
-        $picture	= $this->picture;
-        $level		= $this->level;
-        $extra		= $this->extra;
-        $c_id 		= $this->course['real_id'];
-        $category   = $this->category;
-
+        $weighting = $this->weighting;
+        $position = $this->position;
+        $type = $this->type;
+        $picture = $this->picture;
+        $level = $this->level;
+        $extra = $this->extra;
+        $c_id = $this->course['real_id'];
+        $category = $this->category;
 
         // question already exists
         if(!empty($id)) {
@@ -743,8 +748,15 @@ abstract class Question
 				WHERE c_id = $c_id  AND id = ".intval($id)."";
             Database::query($sql);
             $this->saveCategory($category);
+
             if (!empty($exerciseId)) {
-                api_item_property_update($this->course, TOOL_QUIZ, $id,'QuizQuestionUpdated',api_get_user_id());
+                api_item_property_update(
+                    $this->course,
+                    TOOL_QUIZ,
+                    $id,
+                    'QuizQuestionUpdated',
+                    api_get_user_id()
+                );
             }
             if (api_get_setting('search_enabled')=='true') {
                 if ($exerciseId != 0) {
@@ -806,9 +818,10 @@ abstract class Question
                             VALUES (".$c_id.", ".intval($this->id).", '', NULL , '', '10' , '1', '0;0|0|0', 'square')";
                     Database::query($sql);
                     $id = Database::insert_id();
-
-                    $sql = "UPDATE $TBL_ANSWERS SET id = id_auto WHERE id_auto = $id";
-                    Database::query($sql);
+                    if ($id) {
+                        $sql = "UPDATE $TBL_ANSWERS SET id = id_auto WHERE id_auto = $id";
+                        Database::query($sql);
+                    }
                 }
 
                 if ($type == HOT_SPOT_DELINEATION) {
@@ -816,13 +829,14 @@ abstract class Question
                         TABLE_QUIZ_ANSWER
                     );
                     $sql = "INSERT INTO $TBL_ANSWERS (c_id, question_id , answer , correct , comment , ponderation , position , hotspot_coordinates , hotspot_type )
-                          VALUES (".$c_id.", ".intval($this->id).", '', NULL , '', '10' , '1', '0;0|0|0', 'delineation')";
+                            VALUES (".$c_id.", ".intval($this->id).", '', NULL , '', '10' , '1', '0;0|0|0', 'delineation')";
                     Database::query($sql);
 
                     $id = Database::insert_id();
-
-                    $sql = "UPDATE $TBL_ANSWERS SET id = id_auto WHERE id_auto = $id";
-                    Database::query($sql);
+                    if ($id) {
+                        $sql = "UPDATE $TBL_ANSWERS SET id = id_auto WHERE id_auto = $id";
+                        Database::query($sql);
+                    }
                 }
 
                 if (api_get_setting('search_enabled') == 'true') {
@@ -963,20 +977,20 @@ abstract class Question
      *
      * @author Olivier Brouckaert
      * @param integer $exerciseId - exercise ID
-     * @param boolean $fromSave - comming from $this->save() or not
+     * @param boolean $fromSave - from $this->save() or not
      */
-    function addToList($exerciseId, $fromSave = false)
+    public function addToList($exerciseId, $fromSave = false)
     {
-        $TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
+        $exerciseRelQuestionTable = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
         $id = $this->id;
         // checks if the exercise ID is not in the list
         if (!in_array($exerciseId,$this->exerciseList)) {
-            $this->exerciseList[]=$exerciseId;
+            $this->exerciseList[]= $exerciseId;
             $new_exercise = new Exercise();
             $new_exercise->read($exerciseId);
             $count = $new_exercise->selectNbrQuestions();
             $count++;
-            $sql="INSERT INTO $TBL_EXERCICE_QUESTION (c_id, question_id, exercice_id, question_order) VALUES
+            $sql="INSERT INTO $exerciseRelQuestionTable (c_id, question_id, exercice_id, question_order) VALUES
 			     ({$this->course['real_id']}, ".intval($id).", ".intval($exerciseId).", '$count' )";
             Database::query($sql);
 
@@ -1407,17 +1421,18 @@ abstract class Question
      * abstract function which creates the form to create / edit the answers of the question
      * @param the FormValidator instance
      */
-    abstract function createAnswersForm ($form);
+    abstract function createAnswersForm($form);
 
     /**
      * abstract function which process the creation of answers
      * @param the FormValidator instance
      */
-    abstract function processAnswersCreation ($form);
-
+    abstract function processAnswersCreation($form);
 
     /**
      * Displays the menu of question types
+     *
+     * @param Exercise $objExercise
      */
     public static function display_type_menu($objExercise)
     {
@@ -1434,8 +1449,8 @@ abstract class Question
         if ($feedback_type == 1) {
             //2. but if it is a feedback DIRECT we only show the UNIQUE_ANSWER type that is currently available
             $question_type_custom_list = array (
-                UNIQUE_ANSWER           => self::$questionTypes[UNIQUE_ANSWER],
-                HOT_SPOT_DELINEATION    => self::$questionTypes[HOT_SPOT_DELINEATION]
+                UNIQUE_ANSWER => self::$questionTypes[UNIQUE_ANSWER],
+                HOT_SPOT_DELINEATION => self::$questionTypes[HOT_SPOT_DELINEATION]
             );
         } else {
             unset($question_type_custom_list[HOT_SPOT_DELINEATION]);
@@ -1458,7 +1473,8 @@ abstract class Question
                 $img = $img['filename'].'_na.'.$img['extension'];
                 echo Display::return_icon($img, $explanation, null, ICON_SIZE_BIG);
             } else {
-                echo '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.Display::return_icon($img, $explanation, null, ICON_SIZE_BIG).'</a>';
+                echo '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.
+                    Display::return_icon($img, $explanation, null, ICON_SIZE_BIG).'</a>';
             }
             echo '</div>';
             echo '</li>';