diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php index 94aee1dd4..a546c2f32 100644 --- a/src/www/firewall_nat_1to1_edit.php +++ b/src/www/firewall_nat_1to1_edit.php @@ -31,21 +31,6 @@ require_once("guiconfig.inc"); require_once("interfaces.inc"); require_once("pfsense-utils.inc"); -/** - * fetch list of selectable networks to use in form - */ -function formNetworks() { - $networks = array(); - $networks["any"] = gettext("any"); - foreach (legacy_config_get_interfaces(array("enable" => true)) as $ifent => $ifdetail) { - $networks[$ifent] = htmlspecialchars($ifdetail['descr']) . " " . gettext("net"); - if (!isset($ifdetail['virtual'])) { - $networks[$ifent."ip"] = htmlspecialchars($ifdetail['descr']). " ". gettext("address"); - } - } - return $networks; -} - if (!isset($config['nat']['onetoone'])) { $config['nat']['onetoone'] = array(); @@ -310,7 +295,7 @@ include("head.inc"); "> - $ifdesc): + $ifdesc): ?> @@ -361,7 +346,7 @@ include("head.inc"); "> - $ifdesc): + $ifdesc): ?> diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php index 01cc47111..a9549a4d0 100644 --- a/src/www/firewall_nat_edit.php +++ b/src/www/firewall_nat_edit.php @@ -32,21 +32,6 @@ require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); require_once("filter.inc"); -/** - * fetch list of selectable networks to use in form - */ -function formNetworks() { - $networks = array(); - $networks["any"] = gettext("any"); - foreach (legacy_config_get_interfaces(array("enable" => true)) as $ifent => $ifdetail) { - $networks[$ifent] = htmlspecialchars($ifdetail['descr']) . " " . gettext("net"); - if (!isset($ifdetail['virtual'])) { - $networks[$ifent."ip"] = htmlspecialchars($ifdetail['descr']). " ". gettext("address"); - } - } - return $networks; -} - // init config and get reference if (!isset($config['nat']['rule']) || !is_array($config['nat']['rule'])) { @@ -620,7 +605,7 @@ $( document ).ready(function() { "> - $ifdesc): + $ifdesc): ?> @@ -734,7 +719,7 @@ $( document ).ready(function() { "> - $ifdesc): + $ifdesc): ?> true)) as $ifent => $ifdetail) { - $networks[$ifent] = htmlspecialchars($ifdetail['descr']) . " " . gettext("net"); - if (!isset($ifdetail['virtual'])) { - $networks[$ifent."ip"] = htmlspecialchars($ifdetail['descr']). " ". gettext("address"); - } - } - return $networks; -} - /** * check if advanced options are set on selected element */ @@ -857,7 +842,7 @@ include("head.inc"); "> - $ifdesc): + $ifdesc): ?> @@ -987,7 +972,7 @@ include("head.inc"); "> - $ifdesc): + $ifdesc): ?>