Changeset 745

Timestamp:

May 31, 2021 1:50:48 AM (3 years ago)

Author:

anonymous

Message:

Allow checking isLoggedIn() without incrementing last-access-datetime (to allow for session polling)

File:

• trunk/lib/Auth_Simple.inc.php (modified) (12 diffs)

trunk/lib/Auth_Simple.inc.php

@@ -35 +35 @@
      * @param optional array $params  A hash containing parameters.
      */
-    function __construct($namespace='')
+    public function __construct($namespace='')
     {
         $app =& App::getInstance();
@@ -60 +60 @@
      * @return bool true on success, false on failure
      */
-    function setParam($params)
+    public function setParam($params)
     {
         if (isset($params) && is_array($params)) {
@@ -75 +75 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -94 +94 @@
      * @param mixed $val      Value to set variable to.
      */
-    function set($key, $val)
+    public function set($key, $val)
     {
         if (!isset($_SESSION['_auth_simple'][$this->_ns]['user_data'])) {
@@ -110 +110 @@
      * @return mixed          Value stored in session.
      */
-    function get($key, $default='')
+    public function get($key, $default='')
     {
         if (isset($_SESSION['_auth_simple'][$this->_ns][$key])) {
@@ -126 +126 @@
      * @access public
      */
-    function clear()
+    public function clear()
     {
         $_SESSION['_auth_simple'][$this->_ns] = array('authenticated' => false);
@@ -141 +141 @@
     * @since    04 Mar 2009 21:07:33
     */
-    function login($user_id, $password, $callback)
+    public function login($user_id, $password, $callback)
     {
         global $acct;
@@ -174 +174 @@
     * @since    04 Mar 2009 21:07:33
     */
-    function createSession($user_id)
+    public function createSession($user_id)
     {
         $app =& App::getInstance();
@@ -200 +200 @@
     * @since    04 Mar 2009 21:10:41
     */
-    function isLoggedIn()
+    public function isLoggedIn($update_last_access_datetime=true)
     {
         $app =& App::getInstance();
@@ -212 +212 @@
         ) {
             // User is authenticated!
-            $_SESSION['_auth_simple'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
-            return true;
+            if ($update_last_access_datetime) {
+                $_SESSION['_auth_simple'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
+            }
+            $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)', $_SESSION['_auth_simple'][$this->_ns]['user_id'], $session_expiry_seconds), LOG_DEBUG, __FILE__, __LINE__);
+            return $session_expiry_seconds;
         } else if (isset($_SESSION['_auth_simple'][$this->_ns]['authenticated']) && true === $_SESSION['_auth_simple'][$this->_ns]['authenticated']) {
             // User is authenticated, but login has expired.
@@ -250 +256 @@
      * @access public
      */
-    function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
+    public function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
     {
         $app =& App::getInstance();
@@ -272 +278 @@
      * @return string   Empty string
      */
-    function getUsername($null=null)
+    public function getUsername($null=null)
     {
         return '';
     }
 }
-
-?>