From f4038a2160d55a7f519a3b42be1aa96e29e9a908 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 27 Feb 2013 09:01:40 -0500
Subject: [PATCH] - Fixed "FUNCTION databasename.CONCAT does not exist" error for older MySQL versions.
---
interface/web/dns/ajax_get_json.php | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/interface/web/dns/ajax_get_json.php b/interface/web/dns/ajax_get_json.php
index 410bc77..4ff46c2 100644
--- a/interface/web/dns/ajax_get_json.php
+++ b/interface/web/dns/ajax_get_json.php
@@ -34,7 +34,7 @@
//* Check permissions for module
$app->auth->check_module_permissions('dns');
-$app->uses('tform');
+//$app->uses('tform');
$type = $_GET["type"];
@@ -42,34 +42,37 @@
if($type == 'get_ipv4'){
- $q = $app->db->quote(trim($_GET["q"]));
- $authsql = " AND ".$app->tform->getAuthSQL('r');
- $modules = explode(',', $_SESSION['s']['user']['modules']);
+ //$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=".intval($_SESSION['s']['user']['client_id']).")");
+ //$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']);
+ //$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 = 'IPv6' AND (client_id = 0 OR client_id=".intval($_SESSION['s']['user']['client_id']).")");
-
+ // 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);
}
//}
-function _search($module, $section, $additional_sql = ''){
+/*
+function _search($module, $section, $additional_sql = '', $unique = false){
global $app, $q, $authsql, $modules;
$result_array = array('cheader' => array(), 'cdata' => array());
@@ -143,11 +146,16 @@
'onclick' => '',
'fill_text' => $result[$title_key]
);
- }
+ }
+ if($unique === true){
+ $result_array['cdata'] = array_unique($result_array['cdata']);
+ $result_array['cheader']['total'] = $result_array['cheader']['limit'] = count($result_array['cdata']);
+ }
}
}
return $result_array;
}
+*/
header('Content-type: application/json');
echo $json;
--
Gitblit v1.9.1