From e644c029954cf6de4e9e9690da72b97a17ea1c85 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 03:20:42 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5
---
server/lib/classes/getconf.inc.php | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/lib/classes/getconf.inc.php b/server/lib/classes/getconf.inc.php
index c5ca6c6..768ea2c 100644
--- a/server/lib/classes/getconf.inc.php
+++ b/server/lib/classes/getconf.inc.php
@@ -59,6 +59,15 @@
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
+
+ public function get_security_config($section = '') {
+ global $app;
+
+ $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];
+ }
}
--
Gitblit v1.9.1