From 89e4329a8068e3631d3f64f6896fa3907c687cf5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 08 Jan 2015 09:08:50 -0500
Subject: [PATCH] Layout fix: tab toggle and monitor tables
---
interface/lib/app.inc.php | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 1d80b8a..615e390 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -48,6 +48,7 @@
private $_wb;
private $_loaded_classes = array();
private $_conf;
+ private $_security_config;
public $loaded_plugins = array();
@@ -78,16 +79,16 @@
$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($sess_timeout);
- session_set_cookie_params(($sess_timeout * 60) + 300); // make the cookie live 5 minutes longer
+ session_set_cookie_params(3600 * 24 * 365); // cookie timeout is never updated, so it must not be short
} 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
+ session_set_cookie_params(3600 * 24 * 365); // cookie timeout is never updated, so it must not be short
}
} else {
$this->session->set_timeout($sess_timeout);
- session_set_cookie_params(($sess_timeout * 60) + 300); // make the cookie live 5 minutes longer
+ session_set_cookie_params(3600 * 24 * 365); // cookie timeout is never updated, so it must not be short
}
} else {
session_set_cookie_params(0); // until browser is closed
@@ -109,7 +110,8 @@
}
$this->uses('functions'); // we need this before all others!
- $this->uses('auth,plugin');
+ $this->uses('auth,plugin,ini_parser,getconf');
+
}
public function __get($prop) {
@@ -327,4 +329,13 @@
//* possible future = new app($conf);
$app = new app();
+// load and enable PHP Intrusion Detection System (PHPIDS)
+$ids_security_config = $app->getconf->get_security_config('ids');
+
+if(is_dir(ISPC_CLASS_PATH.'/IDS') && $ids_security_config['ids_enabled'] == 'yes') {
+ $app->uses('ids');
+ $app->ids->start();
+}
+unset($ids_security_config);
+
?>
--
Gitblit v1.9.1