Merge pull request #3256 from phil-davis/patch-5

1 files changed, 12 insertions, 1 deletions

diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php
index 4d7ebe9..17600d3 100644
--- a/src/usr/local/www/firewall_nat_1to1_edit.php
+++ b/src/usr/local/www/firewall_nat_1to1_edit.php
@@ -100,7 +100,6 @@ if (isset($_GET['dup'])) {
 if ($_POST) {
 
 	unset($input_errors);
-	$pconfig = $_POST;
 	/*	run through $_POST items encoding HTML entities so that the user
 	 *	cannot think he is slick and perform a XSS attack on the unwilling
 	 */
@@ -162,6 +161,8 @@ if ($_POST) {
 		$_POST['dsttype'] = "single";
 	}
 
+	$pconfig = $_POST;
+
 	/* For external, user can enter only ip's */
 	if (($_POST['external'] && !is_ipaddr($_POST['external']))) {
 		$input_errors[] = gettext("A valid external subnet must be specified.");
@@ -276,6 +277,11 @@ function build_srctype_list() {
 function srctype_selected() {
 	global $pconfig;
 
+	if ($pconfig['srctype']) {
+		// The rule type came from the $_POST array, after input errors, so keep it.
+		return $pconfig['srctype'];
+	}
+
 	$sel = is_specialnet($pconfig['src']);
 
 	if (!$sel) {
@@ -337,6 +343,11 @@ function build_dsttype_list() {
 function dsttype_selected() {
 	global $pconfig;
 
+	if ($pconfig['dsttype']) {
+		// The rule type came from the $_POST array, after input errors, so keep it.
+		return $pconfig['dsttype'];
+	}
+
 	$sel = is_specialnet($pconfig['dst']);
 
 	if (empty($pconfig['dst']) || $pconfig['dst'] == "any") {