From 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 10:24:09 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcube_session.php | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 6192466..fdbf668 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -24,7 +24,8 @@
/**
* Class to provide database supported session storage
*
- * @package Core
+ * @package Framework
+ * @subpackage Core
* @author Thomas Bruederli <roundcube@gmail.com>
* @author Aleksander Machniak <alec@alec.pl>
*/
@@ -43,7 +44,6 @@
private $secret = '';
private $ip_check = false;
private $logging = false;
- private $keep_alive = 0;
private $memcache;
/**
@@ -525,24 +525,6 @@
$this->now = $now - ($now % ($this->lifetime / 2));
}
- /**
- * Setter for keep_alive interval
- */
- public function set_keep_alive($keep_alive)
- {
- $this->keep_alive = $keep_alive;
-
- if ($this->lifetime < $keep_alive)
- $this->set_lifetime($keep_alive + 30);
- }
-
- /**
- * Getter for keep_alive interval
- */
- public function get_keep_alive()
- {
- return $this->keep_alive;
- }
/**
* Getter for remote IP saved with this session
@@ -552,6 +534,7 @@
return $this->ip;
}
+
/**
* Setter for cookie encryption secret
*/
--
Gitblit v1.9.1