From e86a21bd83a0ae6cadfe9c919582951f306d3b64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 06 Jan 2012 05:55:07 -0500
Subject: [PATCH] - Fix typo in timezone handling, more exception catching
---
program/include/rcube_session.php | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 27cf694..7b2b2dc 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -52,9 +52,9 @@
*/
public function __construct($db, $config)
{
- $this->db = $db;
- $this->start = microtime(true);
- $this->ip = $_SERVER['REMOTE_ADDR'];
+ $this->db = $db;
+ $this->start = microtime(true);
+ $this->ip = $_SERVER['REMOTE_ADDR'];
$this->logging = $config->get('log_session', false);
$lifetime = $config->get('session_lifetime', 1) * 60;
@@ -126,10 +126,10 @@
public function db_read($key)
{
$sql_result = $this->db->query(
- "SELECT vars, ip, changed FROM ".get_table_name('session')." WHERE sess_id = ?",
- $key);
+ "SELECT vars, ip, changed FROM ".get_table_name('session')
+ ." WHERE sess_id = ?", $key);
- if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+ if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
$this->changed = strtotime($sql_arr['changed']);
$this->ip = $sql_arr['ip'];
$this->vars = base64_decode($sql_arr['vars']);
@@ -156,10 +156,15 @@
$ts = microtime(true);
$now = $this->db->fromunixtime((int)$ts);
+ // no session row in DB (db_read() returns false)
+ if (!$this->key) {
+ $oldvars = false;
+ }
// use internal data from read() for fast requests (up to 0.5 sec.)
- if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
+ else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
$oldvars = $this->vars;
- } else { // else read data again from DB
+ }
+ else { // else read data again from DB
$oldvars = $this->db_read($key);
}
@@ -280,8 +285,11 @@
{
$ts = microtime(true);
+ // no session data in cache (mc_read() returns false)
+ if (!$this->key)
+ $oldvars = false;
// use internal data for fast requests (up to 0.5 sec.)
- if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
+ else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
$oldvars = $this->vars;
else // else read data again
$oldvars = $this->mc_read($key);
@@ -313,19 +321,6 @@
{
foreach ($this->gc_handlers as $fct)
call_user_func($fct);
- }
-
-
- /**
- * Cleanup session data before saving
- */
- public function cleanup()
- {
- // current compose information is stored in $_SESSION['compose'], move it to $_SESSION['compose_data_<ID>']
- if ($compose_id = $_SESSION['compose']['id']) {
- $_SESSION['compose_data_'.$compose_id] = $_SESSION['compose'];
- $this->remove('compose');
- }
}
@@ -386,6 +381,21 @@
/**
+ * Re-read session data from storage backend
+ */
+ public function reload()
+ {
+ if ($this->key && $this->memcache)
+ $data = $this->mc_read($this->key);
+ else if ($this->key)
+ $data = $this->db_read($this->key);
+
+ if ($data)
+ session_decode($data);
+ }
+
+
+ /**
* Serialize session data
*/
private function serialize($vars)
--
Gitblit v1.9.1