From 07405653f111c4eb8fd1c83d45e66287807036d7 Mon Sep 17 00:00:00 2001
From: horfic <horfic@ispconfig3>
Date: Thu, 06 Jan 2011 04:26:51 -0500
Subject: [PATCH] *) Added Mailman integration
---
interface/lib/classes/getconf.inc.php | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 097342c..a2be834 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -34,20 +34,26 @@
public function get_server_config($server_id, $section = '') {
global $app;
-
+
if(!is_array($this->config[$server_id])) {
$app->uses('ini_parser');
$server_id = 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"]));
+ $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() {
+ public function get_global_config($section = '') {
+ global $app;
- die("not yet implemented");
+ if(!is_array($this->config['global'])) {
+ $app->uses('ini_parser');
+ $tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
+ $this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
+ }
+ return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1