summaryrefslogtreecommitdiff
path: root/program/include/rcube.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-15 09:34:08 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-15 09:34:08 +0100
commit8d54286df87e21673c05f091e38ca4de14aae326 (patch)
treed60c6d6765f5beafe4966352ebbd52e4c9c9661b /program/include/rcube.php
parent82d875769cade12b82aeab6723c869d87fb7a4c9 (diff)
parentf226549d4f8f258deca9e165ef857252b79d2ee0 (diff)
Merge branch 'keep-alive'
Conflicts: CHANGELOG
Diffstat (limited to 'program/include/rcube.php')
-rw-r--r--program/include/rcube.php30
1 files changed, 3 insertions, 27 deletions
diff --git a/program/include/rcube.php b/program/include/rcube.php
index 0e40b3c6b..9c1a6d84a 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -434,6 +434,9 @@ class rcube
$this->session->register_gc_handler(array($this, 'temp_gc'));
$this->session->register_gc_handler(array($this, 'cache_gc'));
+ $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
+ $this->session->set_ip_check($this->config->get('ip_check'));
+
// start PHP session (if not in CLI mode)
if ($_SERVER['REMOTE_ADDR']) {
session_start();
@@ -442,33 +445,6 @@ class rcube
/**
- * Configure session object internals
- */
- public function session_configure()
- {
- if (!$this->session) {
- return;
- }
-
- $lifetime = $this->config->get('session_lifetime', 0) * 60;
- $keep_alive = $this->config->get('keep_alive');
-
- // set keep-alive/check-recent interval
- if ($keep_alive) {
- // be sure that it's less than session lifetime
- if ($lifetime) {
- $keep_alive = min($keep_alive, $lifetime - 30);
- }
- $keep_alive = max(60, $keep_alive);
- $this->session->set_keep_alive($keep_alive);
- }
-
- $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
- $this->session->set_ip_check($this->config->get('ip_check'));
- }
-
-
- /**
* Garbage collector function for temp files.
* Remove temp files older than two days
*/