From cb50f49b82f8e4992c849cc8d9587a7511d1bf3b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 27 Mar 2013 08:22:14 -0400 Subject: [PATCH] Fixed: FS#2743 - Check if language merge function adds duplicate backslashes when the source file contains a backslashes --- interface/web/sites/ajax_get_json.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php index 53702bd..ba9a32e 100644 --- a/interface/web/sites/ajax_get_json.php +++ b/interface/web/sites/ajax_get_json.php @@ -100,6 +100,15 @@ $json .= '"}'; } + if($type == 'getredirecttype'){ + $json = '{"redirecttype":"'; + $sql = "SELECT redirect_type FROM web_domain WHERE domain_id = $web_id"; + $redirect = $app->db->queryOneRecord($sql); + $json .= $redirect['redirect_type']; + unset($redirect); + $json .= '"}'; + } + if($type == 'get_ipv4'){ $result = array(); @@ -119,6 +128,44 @@ $json = $app->functions->json_encode($result); } + + if($type == 'getdatabaseusers') { + $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) { + $tmp_array[$record['database_user_id']] = $record['database_user']; + } + $json = $app->functions->json_encode($tmp_array); + unset($records, $group, $tmp_array); + } + } + + 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