From efbb88feee52d96ca266485ea2e9d79ce54ff39a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 06 Jun 2014 10:41:28 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/lib/classes/getconf.inc.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 12059ac..45fefa6 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -31,22 +31,22 @@
class getconf {
private $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'])) {
$app->uses('ini_parser');
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
@@ -54,6 +54,7 @@
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
+
}
?>
--
Gitblit v1.9.1