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/dns/ajax_get_json.php | 76 +++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/interface/web/dns/ajax_get_json.php b/interface/web/dns/ajax_get_json.php index 4ff46c2..781fa8e 100644 --- a/interface/web/dns/ajax_get_json.php +++ b/interface/web/dns/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('dns'); @@ -40,34 +40,34 @@ //if($_SESSION["s"]["user"]["typ"] == 'admin') { - - if($type == 'get_ipv4'){ - //$q = $app->db->quote(trim($_GET["q"])); - //$authsql = " AND ".$app->tform->getAuthSQL('r'); - //$modules = explode(',', $_SESSION['s']['user']['modules']); - - $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'){ - //$q = $app->db->quote(trim($_GET["q"])); - //$authsql = " AND ".$app->tform->getAuthSQL('r'); - //$modules = explode(',', $_SESSION['s']['user']['modules']); - - $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 == 'get_ipv4'){ + //$q = $app->db->quote(trim($_GET["q"])); + //$authsql = " AND ".$app->tform->getAuthSQL('r'); + //$modules = explode(',', $_SESSION['s']['user']['modules']); + + $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'){ + //$q = $app->db->quote(trim($_GET["q"])); + //$authsql = " AND ".$app->tform->getAuthSQL('r'); + //$modules = explode(',', $_SESSION['s']['user']['modules']); + + $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); +} //} @@ -81,13 +81,13 @@ $desc_fields = array(); if(is_file('../'.$module.'/form/'.$section.'.tform.php')){ include_once('../'.$module.'/form/'.$section.'.tform.php'); - + $category_title = $form["title"]; $form_file = $form["action"]; $db_table = $form["db_table"]; $db_table_idx = $form["db_table_idx"]; $order_by = $db_table_idx; - + if(is_array($form["tabs"]) && !empty($form["tabs"])){ foreach($form["tabs"] as $tab){ if(is_array($tab['fields']) && !empty($tab['fields'])){ @@ -108,7 +108,7 @@ } } unset($form); - + $where_clause = ''; if(!empty($search_fields)){ $where_clause = implode(' OR ', $search_fields); @@ -120,11 +120,11 @@ if($additional_sql != '') $where_clause .= ' '.$additional_sql.' '; $order_clause = ''; if($order_by != '') $order_clause = ' ORDER BY '.$order_by; - + $sql = "SELECT * FROM ".$db_table." WHERE ".$where_clause.$authsql.$order_clause." LIMIT 0,10"; $results = $app->db->queryAllRecords($sql); - - if(is_array($results) && !empty($results)){ + + if(is_array($results) && !empty($results)){ $lng_file = '../'.$module.'/lib/lang/'.$_SESSION['s']['language'].'_'.$section.'.lng'; if(is_file($lng_file)) include($lng_file); $result_array['cheader'] = array('title' => $category_title, @@ -140,7 +140,7 @@ } if(!empty($desc_items)) $description = implode(' - ', $desc_items); } - + $result_array['cdata'][] = array( 'title' => $wb[$title_key.'_txt'].': '.$result[$title_key], 'description' => $description, 'onclick' => '', @@ -156,7 +156,7 @@ return $result_array; } */ - + header('Content-type: application/json'); echo $json; -?> \ No newline at end of file +?> -- Gitblit v1.9.1