From ef4998c11084b2c99f8af9976f9860d5f7709a0f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 22 Sep 2011 04:48:05 -0400
Subject: [PATCH] Fix compose command from other tasks than mail and address book; skip common request parameters
---
program/include/rcube_session.php | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index bface28..e8bd9d0 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -6,6 +6,7 @@
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2011, The Roundcube Dev Team |
+ | Copyright (C) 2011, Kolab Systems AG |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -51,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;
@@ -125,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']);
@@ -155,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);
}
@@ -192,8 +198,6 @@
*/
private function _fixvars($vars, $oldvars)
{
- $ts = microtime(true);
-
if ($oldvars !== false) {
$a_oldvars = $this->unserialize($oldvars);
if (is_array($a_oldvars)) {
@@ -281,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,7 +320,7 @@
public function gc()
{
foreach ($this->gc_handlers as $fct)
- $fct();
+ call_user_func($fct);
}
@@ -322,9 +329,9 @@
*/
public function cleanup()
{
- // current compose information is stored in $_SESSION['compose'], move it to $_SESSION['compose_data']
- if ($_SESSION['compose']) {
- $_SESSION['compose_data'][$_SESSION['compose']['id']] = $_SESSION['compose'];
+ // 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');
}
}
--
Gitblit v1.9.1