Fix #6173 Refactor NAT Edit src type matching

1) Remove a couple of unused calls to is_specialnet()
2) Change srctype_selected() to use a similar scheme to dsttype_selected() to decide if the existing value matches one of the dropdown list items.
3) Items like "WAN net" and "LAN net" in the src type dropdown were showing as just "WAN" and "LAN" in the dst type dropdown. Fixup the build_dsttype_list() code so it does the same as build_srctype_list() when making the text for those interface networks.
(cherry picked from commit 74ac8b7aeb1cf08dbbcb3baff9c7b97abbe98858)

1 files changed, 7 insertions, 13 deletions

diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php
index 86dd81e..3a77963 100644
--- a/src/usr/local/www/firewall_nat_edit.php
+++ b/src/usr/local/www/firewall_nat_edit.php
@@ -540,8 +540,6 @@ function build_srctype_list() {
 
 	$list = array('any' => gettext('Any'), 'single' => gettext('Single host or alias'), 'network' => gettext('Network'));
 
-	$sel = is_specialnet($pconfig['src']);
-
 	if (have_ruleint_access("pppoe")) {
 		$list['pppoe'] = gettext('PPPoE clients');
 	}
@@ -564,26 +562,22 @@ function srctype_selected() {
 	global $pconfig, $config;
 
 	$selected = "";
-
-	$sel = is_specialnet($pconfig['src']);
-	if (!$sel) {
+	if (array_key_exists($pconfig['src'], build_srctype_list())) {
+		$selected = $pconfig['src'];
+	} else {
 		if ($pconfig['srcmask'] == 32) {
 			$selected = 'single';
 		} else {
 			$selected = 'network';
 		}
-	} else {
-		$selected = $pconfig['src'];
 	}
 
-
 	return($selected);
 }
 
 function build_dsttype_list() {
 	global $pconfig, $config, $ifdisp;
 
-	$sel = is_specialnet($pconfig['dst']);
 	$list = array('any' => gettext('Any'), 'single' => gettext('Single host or alias'), 'network' => gettext('Network'), '(self)' => gettext('This Firewall (self)'));
 
 	if (have_ruleint_access("pppoe")) {
@@ -594,10 +588,10 @@ function build_dsttype_list() {
 		$list['l2tp'] = gettext('L2TP clients');
 	}
 
-	foreach ($ifdisp as $if => $ifdesc) {
-		if (have_ruleint_access($if)) {
-			$list[$if] = $ifdesc;
-			$list[$if . 'ip'] = $ifdesc . ' address';
+	foreach ($ifdisp as $ifent => $ifdesc) {
+		if (have_ruleint_access($ifent)) {
+			$list[$ifent] = $ifdesc . ' net';
+			$list[$ifent . 'ip'] = $ifdesc . ' address';
 		}
 	}