Skip to content

Commit dddc157

Browse files
author
Till Brehm
committed
Update getconf.inc.php
1 parent 2201b7a commit dddc157

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

server/lib/classes/getconf.inc.php

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,28 @@
3030

3131
class getconf {
3232

33-
var $config;
34-
3533
function get_server_config($server_id, $section = '') {
3634
global $app;
3735

38-
if(!is_array($this->config[$server_id])) {
39-
$app->uses('ini_parser');
40-
$server_id = intval($server_id);
41-
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = ?', $server_id);
42-
$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
43-
}
36+
$app->uses('ini_parser');
37+
$server_id = intval($server_id);
38+
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = ?', $server_id);
39+
$config = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
4440

4541
if($section == '') {
46-
return $this->config[$server_id];
42+
return $config;
4743
} else {
48-
return $this->config[$server_id][$section];
44+
return $config[$section];
4945
}
5046
}
5147

5248
public function get_global_config($section = '') {
5349
global $app;
5450

55-
if(!@is_array($this->config['global'])) {
56-
$app->uses('ini_parser');
57-
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
58-
$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
59-
}
60-
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
51+
$app->uses('ini_parser');
52+
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
53+
$config = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
54+
return ($section == '') ? $config : $config[$section];
6155
}
6256

6357
public function get_security_config($section = '') {

0 commit comments

Comments
 (0)