From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 03 Jan 2013 06:51:45 -0500
Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch.
---
interface/web/sites/ajax_get_json.php | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 1194596..f7bbc71 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -148,6 +148,26 @@
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