From 4dfd930ee9af1e9d98f3c41c51d9dec8c3bf34bb Mon Sep 17 00:00:00 2001
From: Darren Embry <dse@webonastick.com>
Date: Thu, 10 May 2012 15:16:31 -0400
Subject: cleanup: code for building arrays for autocompleted fields

---
 usr/local/www/firewall_nat_edit.php | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

(limited to 'usr/local/www/firewall_nat_edit.php')

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index d0ab5ba..ad91112 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -865,36 +865,10 @@ include("fbegin.inc"); ?>
 	nordr_change();
 //-->
 </script>
-<?php
-$isfirst = 0;
-$aliases = "";
-$addrisfirst = 0;
-$aliasesaddr = "";
-if($config['aliases']['alias'] <> "")
-	foreach($config['aliases']['alias'] as $alias_name) {
-		switch ($alias_name['type']) {
-                        case "port":
-                                if($isfirst == 1) $portaliases .= ",";
-                                $portaliases .= "'" . $alias_name['name'] . "'";
-                                $isfirst = 1;
-                                break;
-                        case "host":
-                        case "network":
-                        case "openvpn":
-			case "urltable":
-                                if($addrisfirst == 1) $aliasesaddr .= ",";
-                                $aliasesaddr .= "'" . $alias_name['name'] . "'";
-                                $addrisfirst = 1;
-                                break;
-                        default:
-                                break;
-		}
-	}
-?>
 <script language="JavaScript">
-<!--
-	var addressarray=new Array(<?php echo $aliasesaddr; ?>);
-	var customarray=new Array(<?php echo $portaliases; ?>);
+//<![CDATA[
+	var addressarray = <?= json_encode(get_alias_list(array("host", "network", "openvpn", "urltable"))) ?>;
+	var customarray  = <?= json_encode(get_alias_list("port")) ?>;
 
 	var oTextbox1 = new AutoSuggestControl(document.getElementById("localip"), new StateSuggestions(addressarray));
 	var oTextbox2 = new AutoSuggestControl(document.getElementById("src"), new StateSuggestions(addressarray));
@@ -904,7 +878,7 @@ if($config['aliases']['alias'] <> "")
 	var oTextbox6 = new AutoSuggestControl(document.getElementById("srcbeginport_cust"), new StateSuggestions(customarray));
 	var oTextbox7 = new AutoSuggestControl(document.getElementById("srcendport_cust"), new StateSuggestions(customarray));
 	var oTextbox8 = new AutoSuggestControl(document.getElementById("localbeginport_cust"), new StateSuggestions(customarray));
-//-->
+//]]>
 </script>
 <?php include("fend.inc"); ?>
 </body>
-- 
cgit v1.1