From 7a38df483b6ea65ee2aa17fb25a8518d74d36f06 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 07 Apr 2013 16:08:02 -0400
Subject: [PATCH] SQL error in mail/mail_domain_del.php
---
interface/web/sites/ajax_get_json.php | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 1194596..ba9a32e 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -130,24 +130,42 @@
}
if($type == 'getdatabaseusers') {
- $json = '{';
-
+ $json = '{}';
+
$sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id";
$group = $app->db->queryOneRecord($sql);
if($group) {
$sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $group['sys_groupid'] . "'";
$records = $app->db->queryAllRecords($sql);
+ $tmp_array = array();
foreach($records as $record) {
- $json .= '"'.$record['database_user_id'].'": "'.$record['database_user'].'",';
+ $tmp_array[$record['database_user_id']] = $record['database_user'];
}
- unset($records);
- unset($group);
+ $json = $app->functions->json_encode($tmp_array);
+ unset($records, $group, $tmp_array);
}
-
- if(substr($json,-1) == ',') $json = substr($json,0,-1);
- $json .= '}';
}
+
+ if($type == 'get_use_combobox'){
+ $json = '{"usecombobox":"';
+ $use_combobox = 'y';
+ $server_config_array = $app->getconf->get_global_config();
+ if($server_config_array['misc']['use_combobox'] != 'y') $use_combobox = 'n';
+ $json .= $use_combobox;
+ unset($server_config_array);
+ $json .= '"}';
+ }
+
+ if($type == 'get_use_loadindicator'){
+ $json = '{"useloadindicator":"';
+ $use_loadindicator = 'y';
+ $server_config_array = $app->getconf->get_global_config();
+ if($server_config_array['misc']['use_loadindicator'] != 'y') $use_loadindicator = 'n';
+ $json .= $use_loadindicator;
+ unset($server_config_array);
+ $json .= '"}';
+ }
//}
--
Gitblit v1.9.1