Ticket #467 destination network on firewall_nat_out_edit.php incorrectly parsed.

Submitted-by-someone-who-refuses-to-accept-cvs-account: databeestje

3 files changed, 5 insertions, 5 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index f26d586..d27d60a 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -972,9 +972,9 @@ function filter_nat_rules_generate() {
 
 				$src = $obent['source']['network'];
 				if (isset($obent['destination']['not']) && !isset($obent['destination']['any']))
-					$dst = "!" . $obent['destination']['network'];
+					$dst = "!" . $obent['destination']['address'];
 				else
-					$dst = $obent['destination']['network'];
+					$dst = $obent['destination']['address'];
 
 
 				if (!$obent['interface'] || ($obent['interface'] == "wan"))
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 85a7bae..9b2ed16 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -279,7 +279,7 @@ include("head.inc");
                       else {
                           if (isset($natent['destination']['not']))
                               echo "! ";
-                          echo $natent['destination']['network'];
+                          echo $natent['destination']['address'];
                       }
                     ?>
                   </td>
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 164297d..9fb5ee8 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -159,7 +159,7 @@ if ($_POST) {
 		if (($natent['interface'] == $_POST['interface']) && ($natent['source']['network'] == $osn)) {
 			if (isset($natent['destination']['not']) == isset($_POST['destination_not'])) {
 				if ((isset($natent['destination']['any']) && ($ext == "any")) ||
-						($natent['destination']['network'] == $ext)) {
+						($natent['destination']['address'] == $ext)) {
 					$input_errors[] = "There is already an outbound NAT rule with the specified settings.";
 					break;
 				}
@@ -178,7 +178,7 @@ if ($_POST) {
         if ($ext == "any")
             $natent['destination']['any'] = true;
         else
-            $natent['destination']['network'] = $ext;
+            $natent['destination']['address'] = $ext;
 
         $natent['natport'] = $_POST['natport'];