Changeset 4480 in subversion

Timestamp:

Feb 2, 2011 1:24:14 PM (2 years ago)

Author:

thomasb

Message:

Keep rcube_session->lifetime and keep_alive in sync

Location:

trunk/roundcubemail/program/include

Files:

• rcmail.php (modified) (1 diff)
• rcube_session.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcmail.php

@@ -769 +769 @@
     if (is_object($user) && $user->ID) {
       $this->set_user($user);
+      $this->session_configure();
 
       // set session vars

trunk/roundcubemail/program/include/rcube_session.php

@@ -51 +51 @@
   {
     $this->db = $db;
-    $this->lifetime = $lifetime;
     $this->start = microtime(true);
     $this->ip = $_SERVER['REMOTE_ADDR'];
 
-    // valid time range is now - 1/2 lifetime to now + 1/2 lifetime
-    $now = time();
-    $this->now = $now - ($now % ($this->lifetime / 2));
-    $this->prev = $this->now - ($this->lifetime / 2);
+    $this->set_lifetime($lifetime);
 
     // set custom functions for PHP session management
@@ -366 +362 @@
   }
 
+
+  /**
+   * Setter for session lifetime
+   */
+  public function set_lifetime($lifetime)
+  {
+      $this->lifetime = max(120, $lifetime);
+
+      // valid time range is now - 1/2 lifetime to now + 1/2 lifetime
+      $now = time();
+      $this->now = $now - ($now % ($this->lifetime / 2));
+      $this->prev = $this->now - ($this->lifetime / 2);
+  }
+
   /**
    * Setter for keep_alive interval
@@ -372 +382 @@
   {
     $this->keep_alive = $keep_alive;
+    
+    if ($this->lifetime < $keep_alive)
+        $this->set_lifetime($keep_alive + 30);
   }