From 5a35aa4ace4b018d23dd9644df74651c8f03a75e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 20 Nov 2013 13:08:07 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/lib/app.inc.php | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index e1929d3..6c19f57 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -66,6 +66,14 @@
if($this->_conf['start_session'] == true) {
$this->uses('session');
+ $tmp = $this->db->queryOneRecord("SELECT `value` FROM sys_config WHERE `config_id` = 2 AND `group` = 'interface' AND `name` = 'session_timeout'");
+ if($tmp && $tmp['value'] > 0) {
+ $this->session->set_timeout($tmp['value']);
+ session_set_cookie_params(($tmp['value'] * 60) + 300); // make the cookie live 5 minutes longer
+ } else {
+ session_set_cookie_params(0); // until browser is closed
+ }
+
session_set_save_handler( array($this->session, 'open'),
array($this->session, 'close'),
array($this->session, 'read'),
@@ -74,7 +82,7 @@
array($this->session, 'gc'));
session_start();
-
+
//* Initialize session variables
if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();
if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];
--
Gitblit v1.9.1