From 61f73820621d4ea17ecde3c8d6872e6ce8f9eb12 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 28 Oct 2014 04:35:30 -0400
Subject: [PATCH] - Changed tform_actions.inc.php to always provide oldDataRecord array for updates even when dbhistory = off.
---
interface/lib/classes/getconf.inc.php | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 7a29dbf..a246b18 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;
@@ -55,13 +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 = $app->ini_parser->parse_ini_string(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
-
- return ($section == '') ? $security_config : $security_config[$section];
+ return ($section == '') ? $this->security_config : $this->security_config[$section];
+ }
}
}
--
Gitblit v1.9.1