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/classes/getconf.inc.php | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 1882061..a246b18 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -31,31 +31,47 @@
class getconf {
private $config;
-
+ private $security_config;
+
public function get_server_config($server_id, $section = '') {
global $app;
if(!isset($this->config[$server_id])) {
$app->uses('ini_parser');
- $server_id = intval($server_id);
+ $server_id = $app->functions->intval($server_id);
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id);
$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
}
return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];
}
-
+
public function get_global_config($section = '') {
global $app;
-
- if(isset($this->config['global'])) {
+
+ if(!isset($this->config['global'])) {
$app->uses('ini_parser');
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
- } else {
- $this->config['global'] = NULL;
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
+
+ // Function has been moved to $app->get_security_config($section)
+ public function get_security_config($section = '') {
+ global $app;
+
+ if(is_array($this->security_config)) {
+ return ($section == '') ? $this->security_config : $this->security_config[$section];
+ } else {
+ $app->uses('ini_parser');
+ $security_config_path = '/usr/local/ispconfig/security/security_settings.ini';
+ if(!is_file($security_config_path)) $security_config_path = realpath(ISPC_ROOT_PATH.'/../security/security_settings.ini');
+ $this->security_config = $app->ini_parser->parse_ini_string(file_get_contents($security_config_path));
+
+ return ($section == '') ? $this->security_config : $this->security_config[$section];
+ }
+ }
+
}
?>
--
Gitblit v1.9.1