Fix report accesses by user overview #3118

Fix IP list
chamilo · Jun 22, 2020 · 53094d8 · 53094d8
1 parent f5c2472
commit 53094d8
Showing 1 changed file with 32 additions and 12 deletions.
diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php
@@ -2844,7 +2844,11 @@ public static function getNumberOfTrackAccessOverview()
         $result = Database::query($sql);
         $row = Database::fetch_assoc($result);
 
-        return $row['count'];
+        if ($row) {
+            return $row['count'];
+        }
+
+        return 0;
     }
 
     private static function getDataAccessTrackingFilters($sql)
@@ -2867,7 +2871,7 @@ private static function getDataAccessTrackingFilters($sql)
         $sql .= " AND u.status <> ".ANONYMOUS;
 
         if (isset($_GET['date']) && !empty($_GET['date'])) {
-            $dateRangePicker = new DateRangePicker('date');
+            $dateRangePicker = new DateRangePicker('date', '', ['timePicker' => 'false']);
             $dates = $dateRangePicker->parseDateRange($_GET['date']);
             if (isset($dates['start']) && !empty($dates['start'])) {
                 $dates['start'] = Database::escape_string($dates['start']);
@@ -2940,8 +2944,7 @@ public static function getUserDataAccessTrackingOverview(
 
         $sql .= " GROUP BY u.id ";
         $sql .= " ORDER BY col$column $orderDirection ";
-
-        $sql .= " LIMIT $from,$numberItems";
+        $sql .= " LIMIT $from, $numberItems";
 
         $result = Database::query($sql);
 
@@ -2960,6 +2963,20 @@ public static function getUserDataAccessTrackingOverview(
             $sessionId = (int) $_GET['session_id'];
         }
 
+        $dateStart = null;
+        $dateEnd = null;
+        if (isset($_GET['date']) && !empty($_GET['date'])) {
+            $dateRangePicker = new DateRangePicker('date', '', ['timePicker' => 'false']);
+            $dates = $dateRangePicker->parseDateRange($_GET['date']);
+
+            if (isset($dates['start']) && !empty($dates['start'])) {
+                $dateStart = Database::escape_string($dates['start']);
+            }
+            if (isset($dates['end']) && !empty($dates['end'])) {
+                $dateEnd = Database::escape_string($dates['end']);
+            }
+        }
+
         $return = [];
         //TODO: Dont use numeric index
         foreach ($data as $key => $info) {
@@ -2968,17 +2985,20 @@ public static function getUserDataAccessTrackingOverview(
             $timeSpent = Tracking::get_time_spent_on_the_course($userId, $courseId, $sessionId);
             $timeSpent = api_time_to_hms($timeSpent);
 
-            $ipResult = Database::select(
-                'user_ip',
-                $track_e_login,
-                ['where' => [
-                    '? BETWEEN login_date AND logout_date AND login_user_id = ?' => [$info['logout_course_date'], $userId],
-                ]]
-            );
+            $ipResult = [];
+            if (!empty($dateStart)) {
+                $ipResult = Database::select(
+                    'DISTINCT(user_ip)',
+                    $track_e_login,
+                    ['where' => [
+                        '? BETWEEN ? AND ? AND login_user_id = ?' => [$info['logout_course_date'], $dateStart, $dateEnd, $userId],
+                    ]]
+                );
+            }
 
             $ipList = '';
             if (!empty($ipResult)) {
-                $ipList = implode(',', array_column($ipResult, 'user_ip'));
+                $ipList = implode(', ', array_column($ipResult, 'user_ip'));
             }
 
             $return[$info['user_id']] = [