From e14a82779bd6451ea33f1c25a293743a38161caf Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 14 Aug 2014 16:41:45 -0400
Subject: [PATCH] - Search in relative path for security settings if they were not found in the default location.
---
interface/lib/classes/getconf.inc.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 7a29dbf..5cc223a 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -59,7 +59,9 @@
global $app;
$app->uses('ini_parser');
- $security_config = $app->ini_parser->parse_ini_string(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
+ $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];
}
--
Gitblit v1.9.1