Minor - flint fixes

chamilo · Apr 14, 2020 · 64a8670 · 64a8670
1 parent b53068a
commit 64a8670
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
@@ -3133,28 +3133,6 @@ public function save_stat_track_exercise_info(
         return $id;
     }
 
-    /**
-     * Get number of questions in exercise by user attempt.
-     *
-     * @return int
-     */
-    private function countQuestionsInExercise()
-    {
-        $lpId = isset($_REQUEST['learnpath_id']) ? (int) $_REQUEST['learnpath_id'] : 0;
-        $lpItemId = isset($_REQUEST['learnpath_item_id']) ? (int) $_REQUEST['learnpath_item_id'] : 0;
-        $lpItemViewId = isset($_REQUEST['learnpath_item_view_id']) ? (int) $_REQUEST['learnpath_item_view_id'] : 0;
-
-        $trackInfo = $this->get_stat_track_exercise_info($lpId, $lpItemId, $lpItemViewId);
-
-        if (!empty($trackInfo)) {
-            $questionIds = explode(',', $trackInfo['data_tracking']);
-
-            return count($questionIds);
-        }
-
-        return $this->getQuestionCount();
-    }
-
     /**
      * @param int    $question_id
      * @param int    $questionNum
@@ -9742,6 +9720,28 @@ public static function cleanSessionVariables()
         Session::erase('hotspot_delineation_result');
     }
 
+    /**
+     * Get number of questions in exercise by user attempt.
+     *
+     * @return int
+     */
+    private function countQuestionsInExercise()
+    {
+        $lpId = isset($_REQUEST['learnpath_id']) ? (int) $_REQUEST['learnpath_id'] : 0;
+        $lpItemId = isset($_REQUEST['learnpath_item_id']) ? (int) $_REQUEST['learnpath_item_id'] : 0;
+        $lpItemViewId = isset($_REQUEST['learnpath_item_view_id']) ? (int) $_REQUEST['learnpath_item_view_id'] : 0;
+
+        $trackInfo = $this->get_stat_track_exercise_info($lpId, $lpItemId, $lpItemViewId);
+
+        if (!empty($trackInfo)) {
+            $questionIds = explode(',', $trackInfo['data_tracking']);
+
+            return count($questionIds);
+        }
+
+        return $this->getQuestionCount();
+    }
+
     /**
      * Gets the question list ordered by the question_order setting (drag and drop).
      *

diff --git a/main/inc/global-min.inc.php b/main/inc/global-min.inc.php
@@ -215,7 +215,6 @@
     }
 }
 
-
 ini_set('log_errors', '1');
 
 /**

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
@@ -6482,7 +6482,6 @@ function api_request_uri()
  * @return int access_url_id of the current Chamilo Installation
  *
  * @author Julio Montoya <gugli100@gmail.com>
- *
  */
 function api_get_current_access_url_id()
 {

diff --git a/main/inc/lib/statistics.lib.php b/main/inc/lib/statistics.lib.php
@@ -446,6 +446,7 @@ public static function rescale($data, $max = 500)
      * @param array  $stats
      * @param bool   $showTotal
      * @param bool   $isFileSize
+     *
      * @return string HTML table
      */
     public static function printStats(
@@ -592,11 +593,14 @@ public static function printLoginStats($type)
 
     /**
      * Print the number of recent logins.
-     * @param bool $distinct        whether to only give distinct users stats, or *all* logins
-     * @param int  $sessionDuration Number of minutes a session must have lasted at a minimum to be taken into account
-     * @param array $periods List of number of days we want to query (default: [1, 7, 31] for last 1 day, last 7 days, last 31 days)
-     * @return string HTML table
+     *
+     * @param bool  $distinct        whether to only give distinct users stats, or *all* logins
+     * @param int   $sessionDuration Number of minutes a session must have lasted at a minimum to be taken into account
+     * @param array $periods         List of number of days we want to query (default: [1, 7, 31] for last 1 day, last 7 days, last 31 days)
+     *
      * @throws Exception
+     *
+     * @return string HTML table
      */
     public static function printRecentLoginStats($distinct = false, $sessionDuration = 0, $periods = [])
     {
@@ -679,12 +683,14 @@ public static function printRecentLoginStats($distinct = false, $sessionDuration
 
     /**
      * Get the number of recent logins.
+     *
      * @param bool $distinct            Whether to only give distinct users stats, or *all* logins
      * @param int  $sessionDuration     Number of minutes a session must have lasted at a minimum to be taken into account
      * @param bool $completeMissingDays Whether to fill the daily gaps (if any) when getting a list of logins
      *
-     * @return array
      * @throws Exception
+     *
+     * @return array
      */
     public static function getRecentLoginStats($distinct = false, $sessionDuration = 0, $completeMissingDays = true)
     {