Changeset 671 for trunk/lib/Auth_SQL.inc.php

Timestamp:

Mar 7, 2019 9:07:15 PM (5 years ago)

Author:

anonymous

Message:

Add Auth_SQL->isLoggedIn(CLIENT_ID) return seconds until session expiry. Add humanTime() JS function. Fix site_hostname port separator.

File:

• trunk/lib/Auth_SQL.inc.php (modified) (3 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -381 +381 @@
             $_SESSION['_auth_sql'][$this->_ns]['user_data'] = array();
         }
-        $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key] = $val;
+
+        if (isset($_SESSION['_auth_sql'][$this->_ns][$key])) {
+            $_SESSION['_auth_sql'][$this->_ns][$key] = $val;
+        } else {
+            $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key] = $val;
+        }
     }
 
@@ -617 +622 @@
             // Check the login status of a specific user.
             $qid = $db->query("
-                SELECT 1 FROM " . $this->_params['db_table'] . "
+                SELECT
+                    TIMESTAMPDIFF(SECOND, last_login_datetime, NOW()) AS seconds_since_last_login,
+                    TIMESTAMPDIFF(SECOND, last_access_datetime, NOW()) AS seconds_since_last_access
+                FROM " . $this->_params['db_table'] . "
                 WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
-                AND last_login_datetime > DATE_SUB(NOW(), INTERVAL '" . $this->_params['login_timeout'] . "' SECOND)
-                AND last_access_datetime > DATE_SUB(NOW(), INTERVAL '" . $this->_params['idle_timeout'] . "' SECOND)
+                AND last_login_datetime > DATE_SUB(NOW(), INTERVAL '" . $db->escapeString($this->_params['login_timeout']) . "' SECOND)
+                AND last_access_datetime > DATE_SUB(NOW(), INTERVAL '" . $db->escapeString($this->_params['idle_timeout']) . "' SECOND)
             ");
-            $login_status = (mysql_num_rows($qid) > 0);
-            $app->logMsg(sprintf('Returning %s login status for user_id %s', ($login_status ? 'true' : 'false'), $user_id), LOG_DEBUG, __FILE__, __LINE__);
-            return $login_status;
+            $result = mysql_fetch_assoc($qid);
+            if (mysql_num_rows($qid) > 0 && isset($result['seconds_since_last_login']) && isset($result['seconds_since_last_access'])) {
+                $seconds_until_login_timeout = max(0, $this->_params['login_timeout'] - $result['seconds_since_last_login']);
+                $seconds_until_idle_timeout = max(0, $this->_params['idle_timeout'] - $result['seconds_since_last_access']);
+                $session_expiry_seconds = min($seconds_until_login_timeout, $seconds_until_idle_timeout);
+                $app->logMsg(sprintf('Returning true login status for user_id %s (session expires in %s seconds)', $user_id, $session_expiry_seconds), LOG_DEBUG, __FILE__, __LINE__);
+                return $session_expiry_seconds;
+            } else {
+                $app->logMsg(sprintf('Returning false login status for user_id %s', $user_id), LOG_DEBUG, __FILE__, __LINE__);
+                return false;
+            }
         }
 
@@ -672 +688 @@
         ) {
             // User is authenticated!
-            $_SESSION['_auth_sql'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
+
+            // Update the last_access_datetime to now.
+            $this->set('last_access_datetime', date('Y-m-d H:i:s'));
 
             // Update the DB with the last_access_datetime and increment the seconds_online.