From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 04 Sep 2012 11:42:42 -0400
Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php-
---
interface/lib/classes/getconf.inc.php | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index fd0c088..12059ac 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2006, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -30,31 +30,30 @@
class getconf {
- var $config;
+ private $config;
- function get_server_config($server_id, $section = '') {
+ public function get_server_config($server_id, $section = '') {
global $app;
-
- if(!is_array($this->config[$server_id])) {
+
+ if(!isset($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']));
}
-
- if($section == '') {
- return $this->config[$server_id];
- } else {
- return $this->config[$server_id][$section];
- }
+ return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];
}
- function get_global_config() {
+ public function get_global_config($section = '') {
+ global $app;
- die("not yet implemented");
-
+ if(!isset($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