From ed1d212ae2daea5e4bd043417610177093e99f19 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 16 Jan 2016 03:03:51 -0500
Subject: [PATCH] Improved SVG cleanup code
---
program/lib/Roundcube/rcube_session_redis.php | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/program/lib/Roundcube/rcube_session_redis.php b/program/lib/Roundcube/rcube_session_redis.php
index 07a91cc..7a72b1f 100644
--- a/program/lib/Roundcube/rcube_session_redis.php
+++ b/program/lib/Roundcube/rcube_session_redis.php
@@ -1,20 +1,17 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2014, The Roundcube Dev Team |
- | Copyright (C) 2011, Kolab Systems AG |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
| See the README file for a full license statement. |
| |
| PURPOSE: |
- | Provide database supported session management |
+ | Provide redis supported session management |
+-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com> |
- | Author: Aleksander Machniak <alec@alec.pl> |
| Author: Cor Bosman <cor@roundcu.be> |
+-----------------------------------------------------------------------+
*/
@@ -30,12 +27,17 @@
private $redis;
- public function __construct()
+ /**
+ * @param Object $config
+ */
+ public function __construct($config)
{
+ parent::__construct($config);
+
// instantiate Redis object
$this->redis = new Redis();
- if (! $this->redis) {
+ if (!$this->redis) {
rcube::raise_error(array('code' => 604, 'type' => 'session',
'line' => __LINE__, 'file' => __FILE__,
'message' => "Failed to find Redis. Make sure php-redis is included"),
@@ -43,10 +45,10 @@
}
// get config instance
- $hosts = rcube::get_instance()->config->get('redis_hosts', array());
+ $hosts = $this->config->get('redis_hosts', array('localhost'));
// host config is wrong
- if (!is_array($hosts) || empty($hosts) ) {
+ if (!is_array($hosts) || empty($hosts)) {
rcube::raise_error(array('code' => 604, 'type' => 'session',
'line' => __LINE__, 'file' => __FILE__,
'message' => "Redis host not configured"),
@@ -61,9 +63,9 @@
true, true);
}
- foreach($hosts as $config) {
+ foreach ($hosts as $host) {
// explode individual fields
- list($host, $port, $database, $password) = array_pad(explode(':', $config, 4), 4, null);
+ list($host, $port, $database, $password) = array_pad(explode(':', $host, 4), 4, null);
// set default values if not set
$host = ($host !== null) ? $host : '127.0.0.1';
@@ -115,7 +117,6 @@
// register sessions handler
$this->register_session_handler();
-
}
/**
@@ -151,7 +152,6 @@
return true;
}
-
/**
* read data from redis store
*
@@ -170,9 +170,8 @@
return !empty($this->vars) ? (string) $this->vars : '';
}
- return null;
+ return '';
}
-
/**
* write data to redis store
@@ -187,12 +186,12 @@
$ts = microtime(true);
if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) {
- $this->redis->setex($key, $this->lifetime + 60, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)));
+ $data = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars));
+ $this->redis->setex($key, $this->lifetime + 60, $data);
}
return true;
}
-
/**
* write data to redis store
@@ -203,8 +202,8 @@
*/
public function write($key, $vars)
{
- return $this->redis->setex($key, $this->lifetime + 60, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars)));
+ $data = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
+
+ return $this->redis->setex($key, $this->lifetime + 60, $data);
}
-
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1