cleanup: code for building arrays for autocompleted fields

1 files changed, 3 insertions, 25 deletions

diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index 135d0e9..d6dc9af 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -467,33 +467,11 @@ function typesel_change() {
 <script language="JavaScript">
         typesel_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 "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; ?>);
-
+//<![CDATA[
+	var addressarray = <?= json_encode(get_alias_list(array("host", "network", "openvpn", "urltable"))) ?>;
         var oTextbox1 = new AutoSuggestControl(document.getElementById("dst"), new StateSuggestions(addressarray));
-//-->
+//]]>
 </script>
 <?php include("fend.inc"); ?>
 </body>