From 71c74b1b572f3bdf00ba99009cc23f8f48072a1c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 08 Mar 2014 11:58:49 -0500
Subject: [PATCH] Fixed: FS#3372 - Web browser password autofill function overwrites settings
---
interface/lib/classes/getconf.inc.php | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index fd0c088..45fefa6 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,31 @@
class getconf {
- var $config;
-
- function get_server_config($server_id, $section = '') {
+ private $config;
+
+ 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_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']));
}
-
- 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];
+ }
+
+ 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');
+ $this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
}
+ return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
-
- function get_global_config() {
-
- die("not yet implemented");
-
- }
-
+
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1