From ad955792a8ade5c0015aa3d68f86b1035c1acc31 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 22 Jan 2014 11:30:52 -0500
Subject: [PATCH] Fixed bug from previous commit
---
interface/lib/app.inc.php | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index e0b237b..64d2248 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -64,27 +64,52 @@
//* Start the session
if($this->_conf['start_session'] == true) {
-
- $this->uses('session');
- session_set_save_handler( array($this->session, 'open'),
- array($this->session, 'close'),
- array($this->session, 'read'),
- array($this->session, 'write'),
- array($this->session, 'destroy'),
- array($this->session, 'gc'));
-
- session_start();
+ $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) {
+ /* check if user wants to stay logged in */
+ if(isset($_POST['s_mod']) && isset($_POST['s_pg']) && $_POST['s_mod'] == 'login' && $_POST['s_pg'] == 'index' && isset($_POST['stay']) && $_POST['stay'] == '1') {
+ /* check if staying logged in is allowed */
+ $this->uses('ini_parser');
+ $tmp = $this->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
+ $tmp = $this->ini_parser->parse_ini_string(stripslashes($tmp['config']));
+ if(!isset($tmp['misc']['session_allow_endless']) || $tmp['misc']['session_allow_endless'] != 'y') {
+ $this->session->set_timeout($tmp['value']);
+ session_set_cookie_params(($tmp['value'] * 60) + 300); // make the cookie live 5 minutes longer
+ } else {
+ // we are doing login here, so we need to set the session data
+ $this->session->set_permanent(true);
+ $this->session->set_timeout(365 * 24 * 3600); // one year
+ session_set_cookie_params(365 * 24 * 3600); // make the cookie live 5 minutes longer
+ }
+ } else {
+ $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'),
+ array($this->session, 'write'),
+ array($this->session, 'destroy'),
+ 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'];
if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
}
- $this->uses('functions'); // we need this before all others!
+ $this->uses('functions'); // we need this before all others!
$this->uses('auth,plugin');
}
-
+
public function __destruct() {
session_write_close();
}
@@ -96,7 +121,7 @@
$classname = trim($classname);
//* Class is not loaded so load it
if(!array_key_exists($classname, $this->_loaded_classes)) {
- include_once(ISPC_CLASS_PATH."/$classname.inc.php");
+ include_once ISPC_CLASS_PATH."/$classname.inc.php";
$this->$classname = new $classname();
$this->_loaded_classes[$classname] = true;
}
@@ -109,12 +134,14 @@
if(is_array($fl)) {
foreach($fl as $file) {
$file = trim($file);
- include_once(ISPC_CLASS_PATH."/$file.inc.php");
+ include_once ISPC_CLASS_PATH."/$file.inc.php";
}
}
}
/** Priority values are: 0 = DEBUG, 1 = WARNING, 2 = ERROR */
+
+
public function log($msg, $priority = 0) {
global $conf;
if($priority >= $this->_conf['log_priority']) {
@@ -196,12 +223,12 @@
//** Helper function to load the language files.
public function load_language_file($filename) {
$filename = ISPC_ROOT_PATH.'/'.$filename;
- if(substr($filename,-4) != '.lng') $this->error('Language file has wrong extension.');
+ if(substr($filename, -4) != '.lng') $this->error('Language file has wrong extension.');
if(file_exists($filename)) {
- @include($filename);
+ @include $filename;
if(is_array($wb)) {
if(is_array($this->_wb)) {
- $this->_wb = array_merge($this->_wb,$wb);
+ $this->_wb = array_merge($this->_wb, $wb);
} else {
$this->_wb = $wb;
}
@@ -213,12 +240,12 @@
$this->tpl->setVar('app_title', $this->_conf['app_title']);
if(isset($_SESSION['s']['user'])) {
$this->tpl->setVar('app_version', $this->_conf['app_version']);
- // get pending datalog changes
- $datalog = $this->db->datalogStatus();
- $this->tpl->setVar('datalog_changes_txt', $this->lng('datalog_changes_txt'));
- $this->tpl->setVar('datalog_changes_end_txt', $this->lng('datalog_changes_end_txt'));
- $this->tpl->setVar('datalog_changes_count', $datalog['count']);
- $this->tpl->setLoop('datalog_changes', $datalog['entries']);
+ // get pending datalog changes
+ $datalog = $this->db->datalogStatus();
+ $this->tpl->setVar('datalog_changes_txt', $this->lng('datalog_changes_txt'));
+ $this->tpl->setVar('datalog_changes_end_txt', $this->lng('datalog_changes_end_txt'));
+ $this->tpl->setVar('datalog_changes_count', $datalog['count']);
+ $this->tpl->setLoop('datalog_changes', $datalog['entries']);
} else {
$this->tpl->setVar('app_version', '');
}
@@ -253,13 +280,13 @@
$this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']);
$this->tpl->setVar('logout_txt', $this->lng('logout_txt'));
/* Show search field only for normal users, not mail users */
- if(stristr($_SESSION['s']['user']['username'],'@')){
+ if(stristr($_SESSION['s']['user']['username'], '@')){
$this->tpl->setVar('usertype', 'mailuser');
} else {
$this->tpl->setVar('usertype', 'normaluser');
}
}
-
+
/* Global Search */
$this->tpl->setVar('globalsearch_resultslimit_of_txt', $this->lng('globalsearch_resultslimit_of_txt'));
$this->tpl->setVar('globalsearch_resultslimit_results_txt', $this->lng('globalsearch_resultslimit_results_txt'));
--
Gitblit v1.9.1