From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
interface/web/sites/ajax_get_json.php | 286 ++++++++++++++++++++++++++++----------------------------
1 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 9da4513..6800897 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('sites');
@@ -44,154 +44,154 @@
//if($_SESSION["s"]["user"]["typ"] == 'admin') {
- if($type == 'getservertype'){
- $json = '{"servertype":"';
- $server_type = 'apache';
- $web_config = $app->getconf->get_server_config($server_id, 'web');
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- $json .= $server_type;
- unset($webconfig);
- $json .= '"}';
- }
-
- if($type == 'getserverid'){
- $json = '{"serverid":"';
- $sql = "SELECT server_id FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
- $server = $app->db->queryOneRecord($sql);
- $json .= $server['server_id'];
- unset($server);
- $json .= '"}';
- }
-
- if($type == 'getphpfastcgi'){
- $json = '{';
-
- $server_type = 'apache';
- $web_config = $app->getconf->get_server_config($server_id, 'web');
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $php_type == 'fast-cgi') $php_type = 'php-fpm';
- $sql_where = '';
-
- //* Client: If the logged in user is not admin and has no sub clients (no reseller)
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"] . ")";
- //* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
- } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = $client_group_id");
- //$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
- $sql_where = " AND (client_id = 0";
- if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
- $sql_where .= ")";
- //* Admin: If the logged in user is admin
- } else {
- //$sql_where = '';
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = $client_group_id");
- //$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
- $sql_where = " AND (client_id = 0";
- if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
- $sql_where .= ")";
- }
-
- if($php_type == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id".$sql_where);
- }
- if($php_type == 'fast-cgi'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = $server_id".$sql_where);
- }
- $php_select = "";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($php_type == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $json .= '"'.$php_version.'": "'.$php_record['name'].'",';
- }
- }
- unset($php_records);
- if(substr($json,-1) == ',') $json = substr($json,0,-1);
- $json .= '}';
- }
-
- if($type == 'getphptype'){
- $json = '{"phptype":"';
- $sql = "SELECT php FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
- $php = $app->db->queryOneRecord($sql);
- $json .= $php['php'];
- unset($php);
- $json .= '"}';
- }
-
- if($type == 'getredirecttype'){
- $json = '{"redirecttype":"';
- $sql = "SELECT redirect_type FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
- $redirect = $app->db->queryOneRecord($sql);
- $json .= $redirect['redirect_type'];
- unset($redirect);
- $json .= '"}';
- }
-
- if($type == 'get_ipv4'){
- $result = array();
-
- // ipv4
- //$result[] = _search('admin', 'server_ip', "AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- $result[] = $app->functions->suggest_ips('IPv4');
+if($type == 'getservertype'){
+ $json = '{"servertype":"';
+ $server_type = 'apache';
+ $web_config = $app->getconf->get_server_config($server_id, 'web');
+ if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
+ $json .= $server_type;
+ unset($webconfig);
+ $json .= '"}';
+}
- $json = $app->functions->json_encode($result);
+if($type == 'getserverid'){
+ $json = '{"serverid":"';
+ $sql = "SELECT server_id FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
+ $server = $app->db->queryOneRecord($sql);
+ $json .= $server['server_id'];
+ unset($server);
+ $json .= '"}';
+}
+
+if($type == 'getphpfastcgi'){
+ $json = '{';
+
+ $server_type = 'apache';
+ $web_config = $app->getconf->get_server_config($server_id, 'web');
+ if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
+ if($server_type == 'nginx' && $php_type == 'fast-cgi') $php_type = 'php-fpm';
+ $sql_where = '';
+
+ //* Client: If the logged in user is not admin and has no sub clients (no reseller)
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"] . ")";
+ //* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
+ } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = $client_group_id");
+ //$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
+ $sql_where = " AND (client_id = 0";
+ if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
+ $sql_where .= ")";
+ //* Admin: If the logged in user is admin
+ } else {
+ //$sql_where = '';
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = $client_group_id");
+ //$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
+ $sql_where = " AND (client_id = 0";
+ if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
+ $sql_where .= ")";
}
-
- if($type == 'get_ipv6'){
- $result = array();
-
- // ipv6
- //$result[] = _search('admin', 'server_ip', "AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- $result[] = $app->functions->suggest_ips('IPv6');
-
- $json = $app->functions->json_encode($result);
+
+ if($php_type == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id".$sql_where);
}
-
- if($type == 'getdatabaseusers') {
- $json = '{}';
-
- $sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
- $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($php_type == 'fast-cgi'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = $server_id".$sql_where);
}
-
- 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 .= '"}';
+ $php_select = "";
+ if(is_array($php_records) && !empty($php_records)) {
+ foreach( $php_records as $php_record) {
+ if($php_type == 'php-fpm'){
+ $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
+ } else {
+ $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
+ }
+ $json .= '"'.$php_version.'": "'.$php_record['name'].'",';
+ }
}
+ unset($php_records);
+ if(substr($json, -1) == ',') $json = substr($json, 0, -1);
+ $json .= '}';
+}
+
+if($type == 'getphptype'){
+ $json = '{"phptype":"';
+ $sql = "SELECT php FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
+ $php = $app->db->queryOneRecord($sql);
+ $json .= $php['php'];
+ unset($php);
+ $json .= '"}';
+}
+
+if($type == 'getredirecttype'){
+ $json = '{"redirecttype":"';
+ $sql = "SELECT redirect_type FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
+ $redirect = $app->db->queryOneRecord($sql);
+ $json .= $redirect['redirect_type'];
+ unset($redirect);
+ $json .= '"}';
+}
+
+if($type == 'get_ipv4'){
+ $result = array();
+
+ // ipv4
+ //$result[] = _search('admin', 'server_ip', "AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ $result[] = $app->functions->suggest_ips('IPv4');
+
+ $json = $app->functions->json_encode($result);
+}
+
+if($type == 'get_ipv6'){
+ $result = array();
+
+ // ipv6
+ //$result[] = _search('admin', 'server_ip', "AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ $result[] = $app->functions->suggest_ips('IPv6');
+
+ $json = $app->functions->json_encode($result);
+}
+
+if($type == 'getdatabaseusers') {
+ $json = '{}';
+
+ $sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
+ $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 .= '"}';
+}
//}
header('Content-type: application/json');
echo $json;
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1