Change date range query in report BT#16844

main/inc/lib/tracking.lib.php

@@ -1653,6 +1653,7 @@ class Tracking
      * @param string    $timeFilter type of time filter: 'last_week' or 'custom'
      * @param string    $start_date start date date('Y-m-d H:i:s')
      * @param string    $end_date   end date date('Y-m-d H:i:s')
+     * @param bool      $returnAllRecords
      *
      * @return int
      */
@@ -1670,7 +1671,8 @@ class Tracking
             $userList = array_map('intval', $userId);
             $userCondition = " login_user_id IN ('".implode("','", $userList)."')";
         } else {
-            $userCondition = " login_user_id = ".intval($userId);
+            $userId = (int) $userId;
+            $userCondition = " login_user_id = $userId ";
         }
 
         $url_condition = null;
@@ -1678,7 +1680,7 @@ class Tracking
         $url_table = null;
         if (api_is_multiple_url_enabled()) {
             $access_url_id = api_get_current_access_url_id();
-            $url_table = ", ".$tbl_url_rel_user." as url_users";
+            $url_table = ", $tbl_url_rel_user as url_users";
             $url_condition = " AND u.login_user_id = url_users.user_id AND access_url_id='$access_url_id'";
         }
 
@@ -1699,6 +1701,17 @@ class Tracking
                 $condition_time = " AND (login_date >= '{$newDate->format('Y-m-d H:i:s')}'";
                 $condition_time .= "AND logout_date <= '{$today->format('Y-m-d H:i:s')}') ";
                 break;
+            case 'wide':
+                if (!empty($start_date) && !empty($end_date)) {
+                    $start_date = Database::escape_string($start_date);
+                    $end_date = Database::escape_string($end_date);
+                    $condition_time = ' AND (
+                        (login_date >= "'.$start_date.'" AND login_date <= "'.$end_date.'") OR
+                        (logout_date >= "'.$start_date.'" AND logout_date <= "'.$end_date.'") OR
+                        (login_date <= "'.$start_date.'" AND logout_date >= "'.$end_date.'")
+                    ) ';
+                }
+                break;
             case 'custom':
                 if (!empty($start_date) && !empty($end_date)) {
                     $start_date = Database::escape_string($start_date);

main/mySpace/access_details_session.php

@@ -422,7 +422,7 @@ if ($formByDay->validate()) {
     $from = api_get_utc_datetime($fromObject->format('Y-m-d').' 00:00:00');
     $to = api_get_utc_datetime($toObject->format('Y-m-d').' 23:59:59');
 
-    $list = Tracking::get_time_spent_on_the_platform($userId, 'custom', $from, $to, true);
+    $list = Tracking::get_time_spent_on_the_platform($userId, 'wide', $from, $to, true);
     $newList = [];
     foreach ($list as $item) {
         $key = substr($item['login_date'], 0, 10);