From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/lib/classes/getconf.inc.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 2a9dcc1..ad2a302 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -34,12 +34,12 @@
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']));
}
return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];
}
@@ -47,13 +47,13 @@
public function get_global_config($section = '') {
global $app;
- if(!is_array($this->config['global'])) {
+ 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"]));
+ $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