From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo
---
interface/lib/classes/getconf.inc.php | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 5cc223a..ef9e070 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -31,6 +31,7 @@
class getconf {
private $config;
+ private $security_config;
public function get_server_config($server_id, $section = '') {
global $app;
@@ -38,7 +39,7 @@
if(!isset($this->config[$server_id])) {
$app->uses('ini_parser');
$server_id = $app->functions->intval($server_id);
- $server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$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];
@@ -55,15 +56,20 @@
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));
- $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');
- $security_config = $app->ini_parser->parse_ini_string(file_get_contents($security_config_path));
-
- return ($section == '') ? $security_config : $security_config[$section];
+ return ($section == '') ? $this->security_config : $this->security_config[$section];
+ }
}
}
--
Gitblit v1.9.1