ソースを参照

Minor - Add flash message, format code, fix phpdocs

Julio Montoya 5 年 前
コミット
dbe48db9fc
3 ファイル変更19 行追加15 行削除
  1. 3 1
      main/exercise/admin.php
  2. 2 2
      main/exercise/question_admin.inc.php
  3. 14 12
      main/inc/lib/events.lib.php

+ 3 - 1
main/exercise/admin.php

@@ -62,7 +62,7 @@ if (!$is_allowedToEdit) {
     api_not_allowed(true);
 }
 
-$exerciseId = isset($_GET['exerciseId']) ? (int) $_GET['exerciseId'] : '0';
+$exerciseId = isset($_GET['exerciseId']) ? (int) $_GET['exerciseId'] : 0;
 
 /*  stripslashes POST data  */
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -253,6 +253,8 @@ if (!empty($clone_question) && !empty($objExercise->id)) {
     // Reloading tne $objExercise obj
     $objExercise->read($objExercise->id, false);
 
+    Display::addFlash(Display::return_message(get_lang('ItemCopied')));
+
     header('Location: admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&page='.$page);
     exit;
 }

+ 2 - 2
main/exercise/question_admin.inc.php

@@ -13,10 +13,10 @@
  */
 if (isset($_GET['editQuestion'])) {
     $objQuestion = Question::read($_GET['editQuestion']);
-    $action = api_get_self()."?".api_get_cidreq()."&myid=1&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id.'&page='.$page;
+    $action = api_get_self().'?'.api_get_cidreq()."&myid=1&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id.'&page='.$page;
 } else {
     $objQuestion = Question::getInstance($_REQUEST['answerType']);
-    $action = api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion;
+    $action = api_get_self().'?'.api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion;
 }
 
 if (is_object($objQuestion)) {

+ 14 - 12
main/inc/lib/events.lib.php

@@ -1282,13 +1282,15 @@ class Event
         $course_id,
         $session_id = 0
     ) {
-        $track_e_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
         $user_id = (int) $user_id;
         $exercise_id = (int) $exercise_id;
         $course_id = (int) $course_id;
         $session_id = (int) $session_id;
-        if (!empty($user_id) && !empty($exercise_id) && !empty($course_code)) {
-            $sql = "DELETE FROM $track_e_exercises
+
+        if (!empty($user_id) && !empty($exercise_id) && !empty($course_id)) {
+            $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+            $sql = "DELETE FROM $table
                     WHERE
                         exe_user_id = $user_id AND
                         exe_exo_id = $exercise_id AND
@@ -1311,9 +1313,9 @@ class Event
     /**
      * Gets all exercise results (NO Exercises in LPs ) from a given exercise id, course, session.
      *
-     * @param   int     exercise id
+     * @param int $exercise_id
      * @param int $courseId
-     * @param   int     session id
+     * @param int $session_id
      *
      * @return array with the results
      */
@@ -1365,8 +1367,8 @@ class Event
     /**
      * Gets all exercise results (NO Exercises in LPs ) from a given exercise id, course, session.
      *
-     * @param int $courseId
-     * @param   int     session id
+     * @param int  $courseId
+     * @param int  $session_id
      * @param bool $get_count
      *
      * @return array with the results
@@ -1409,9 +1411,9 @@ class Event
     /**
      * Gets all exercise results (NO Exercises in LPs) from a given exercise id, course, session.
      *
-     * @param   int     exercise id
+     * @param   int     $user_id
      * @param int $courseId
-     * @param   int     session id
+     * @param   int     $session_id
      *
      * @return array with the results
      */
@@ -1454,7 +1456,7 @@ class Event
     /**
      * Gets exercise results (NO Exercises in LPs) from a given exercise id, course, session.
      *
-     * @param int    $exe_id exercise id
+     * @param int    $exe_id attempt id
      * @param string $status
      *
      * @return array with the results
@@ -1574,9 +1576,9 @@ class Event
      * Count exercise attempts (NO Exercises in LPs ) from a given exercise id, course, session.
      *
      * @param int $user_id
-     * @param   int     exercise id
+     * @param int $exercise_id
      * @param int $courseId
-     * @param   int     session id
+     * @param int $session_id
      *
      * @return array with the results
      */