From d161b2e47d8ecc26e94a0c7ebe1d353ebbba620f Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 25 Dec 2013 20:57:37 -0500 Subject: [PATCH] Fix session end date check to include whole end day - less confusing like this - refs #6795 --- main/inc/lib/sessionmanager.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 8632f4d432..b8ceddd10f 100644 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -268,12 +268,12 @@ class SessionManager $sql = "SELECT count(id) as total_rows FROM ( SELECT IF ( - (s.date_start <= '$today' AND '$today' < s.date_end) OR + (s.date_start <= '$today' AND '$today' <= s.date_end) OR (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.date_start,'".$today."' ".") <= s.nb_days_access_before_beginning) OR (s.nb_days_access_after_end > 0 AND DATEDIFF('".$today."',s.date_end) <= s.nb_days_access_after_end) OR (s.date_start = '0000-00-00' AND s.date_end = '0000-00-00' ) OR (s.date_start <= '$today' AND '0000-00-00' = s.date_end) OR - ('$today' < s.date_end AND '0000-00-00' = s.date_start) + ('$today' <= s.date_end AND '0000-00-00' = s.date_start) , 1, 0) as session_active, s.id, @@ -294,12 +294,12 @@ class SessionManager $sql = "SELECT count(id) as total_rows FROM ( SELECT IF ( - (s.date_start <= '$today' AND '$today' < s.date_end) OR + (s.date_start <= '$today' AND '$today' <= s.date_end) OR (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.date_start,'".$today."' ".") <= s.nb_days_access_before_beginning) OR (s.nb_days_access_after_end > 0 AND DATEDIFF('".$today."',s.date_end) <= s.nb_days_access_after_end) OR (s.date_start = '0000-00-00' AND s.date_end = '0000-00-00' ) OR (s.date_start <= '$today' AND '0000-00-00' = s.date_end) OR - ('$today' < s.date_end AND '0000-00-00' = s.date_start) + ('$today' <= s.date_end AND '0000-00-00' = s.date_start) , 1, 0) as session_active, s.id @@ -382,12 +382,12 @@ class SessionManager $select = "SELECT * FROM (SELECT IF ( - (s.date_start <= '$today' AND '$today' < s.date_end) OR + (s.date_start <= '$today' AND '$today' <= s.date_end) OR (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.date_start,'".$today."' ".") <= s.nb_days_access_before_beginning) OR (s.nb_days_access_after_end > 0 AND DATEDIFF('".$today."',s.date_end) <= s.nb_days_access_after_end) OR (s.date_start = '0000-00-00' AND s.date_end = '0000-00-00' ) OR (s.date_start <= '$today' AND '0000-00-00' = s.date_end) OR - ('$today' < s.date_end AND '0000-00-00' = s.date_start) + ('$today' <= s.date_end AND '0000-00-00' = s.date_start) , 1, 0) as session_active, s.name,