Tracking: Fix queries in quarterly reports - refs BT#16108

Author: ywarnier

main/inc/lib/tracking.lib.php

@@ -2596,16 +2596,16 @@ public static function getTotalTimeSpentInCourses(
         if (api_is_multiple_url_enabled()) {
             $accessUrlId = api_get_current_access_url_id();
             $tableUrl = ", ".$tableUrlRelUser." as url_users";
-            $urlCondition = " AND u.login_user_id = url_users.user_id AND access_url_id = $accessUrlId";
+            $urlCondition = " AND teca.user_id = url_users.user_id AND url_users.access_url_id = $accessUrlId";
         }
 
         if (!empty($dateFrom) && !empty($dateUntil)) {
             $dateFrom = Database::escape_string($dateFrom);
             $dateUntil = Database::escape_string($dateUntil);
-            $conditionTime = " (login_course_date >= '$dateFrom' AND logout_course_date <= '$dateUntil' ) ";
+            $conditionTime = " (teca.login_course_date >= '$dateFrom' AND teca.logout_course_date <= '$dateUntil' ) ";
         }
-        $sql = "SELECT SUM(TIMESTAMPDIFF(HOUR, login_course_date, logout_course_date)) diff
-    	        FROM $tableTrackLogin u $tableUrl
+        $sql = "SELECT SUM(TIMESTAMPDIFF(HOUR, teca.login_course_date, teca.logout_course_date)) diff
+    	        FROM $tableTrackLogin teca $tableUrl
                 WHERE $conditionTime $urlCondition";
 
         $rs = Database::query($sql);

main/inc/lib/usermanager.lib.php

@@ -4563,15 +4563,19 @@ public static function is_admin($user_id)
      * @return mixed Number of users or false on error
      */
     public static function get_number_of_users(
-        $status = 0,
-        $access_url_id = 1,
-        $active = null,
+        int $status = null,
+        int $access_url_id = null,
+        int $active = null,
         string $dateFrom = null,
         string $dateUntil = null
     ) {
         $tableUser = Database::get_main_table(TABLE_MAIN_USER);
         $tableAccessUrlRelUser = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
+        if (empty($access_url_id)) {
+            $access_url_id = api_get_current_access_url_id();
+        }
+
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT count(u.id)
                     FROM $tableUser u