From 0327c04ef25a6879a85b7a4a352147f4746703ee Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Fri, 29 Jun 2018 13:04:33 -0500
Subject: [PATCH] RT# 30783 Clean up json code for free_addrs

---
 FS/FS/svc_IP_Mixin.pm                                              | 7 ++++---
 httemplate/elements/tr-select-router_block_ip.html                 | 2 +-
 .../xmlhttp-free_addresses_in_block.json.html}                     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename httemplate/{json/free_addresses_in_block.json.html => misc/xmlhttp-free_addresses_in_block.json.html} (94%)

diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm
index 19c7e05fc..56165dce5 100644
--- a/FS/FS/svc_IP_Mixin.pm
+++ b/FS/FS/svc_IP_Mixin.pm
@@ -132,7 +132,7 @@ sub _used_addresses {
   #       parameter to bypass FS::Record objects creation and just
   #       return hashrefs from DBI.  200,000 hashrefs are many seconds faster
   #       than 200,000 FS::Record objects
-  my %qsearch = (
+  my %qsearch_param = (
       table     => $class->table,
       select    => $ip_field,
       hashref   => \%qsearch,
@@ -140,7 +140,8 @@ sub _used_addresses {
   );
   if ( $octets ) {
     my $block_str = join('.', (split(/\D/, $block_na->first))[0..$octets-1]);
-    $qsearch{extra_sql} .= " AND $ip_field LIKE ".dbh->quote("${block_str}.%");
+    $qsearch_param{extra_sql}
+      .= " AND $ip_field LIKE ".dbh->quote("${block_str}.%");
   }
 
   if ( $block->ip_netmask % 8 ) {
@@ -154,7 +155,7 @@ sub _used_addresses {
 
   return
     map { $_->$ip_field }
-    qsearch( \%qsearch );
+    qsearch( \%qsearch_param );
 }
 
 sub _is_used {
diff --git a/httemplate/elements/tr-select-router_block_ip.html b/httemplate/elements/tr-select-router_block_ip.html
index 535e953c4..eac41cfad 100644
--- a/httemplate/elements/tr-select-router_block_ip.html
+++ b/httemplate/elements/tr-select-router_block_ip.html
@@ -71,7 +71,7 @@ function populate_ip_select() {
 % }
   if ( blocknum && $.isNumeric(blocknum) && ! e.is(':hidden')) {
     $.getJSON(
-      '<% $p %>json/free_addresses_in_block.json.html',
+      '<% $p %>misc/xmlhttp-free_addresses_in_block.json.html',
       {blocknum: blocknum},
       function(ip_json) {
         $.each( ip_json, function(idx, val) {
diff --git a/httemplate/json/free_addresses_in_block.json.html b/httemplate/misc/xmlhttp-free_addresses_in_block.json.html
similarity index 94%
rename from httemplate/json/free_addresses_in_block.json.html
rename to httemplate/misc/xmlhttp-free_addresses_in_block.json.html
index 6785aac6b..801718d35 100644
--- a/httemplate/json/free_addresses_in_block.json.html
+++ b/httemplate/misc/xmlhttp-free_addresses_in_block.json.html
@@ -3,7 +3,7 @@
   Unless block is larger than /24 - Does somebody really want to populate
   65k addresses into a HTML selectbox?
 </%doc>
-<% encode_rest($json) %>\
+<% encode_json($json) %>\
 <%init>
 
 my $json = [];
-- 
2.11.0