From b52d3aa509a54854a0fccd7685f4db12ad5fc15f Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Mon, 12 Apr 2010 10:42:31 -0300
Subject: [PATCH] When renaming or removing aliases, deal with new NAT Port
 Forwarding fields

---
 usr/local/www/firewall_aliases.php      | 30 ++++++++++++++++---------
 usr/local/www/firewall_aliases_edit.php |  5 ++++-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index 1598c9fb83..842447e3bc 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -113,21 +113,31 @@ if ($_GET['act'] == "del") {
 		if($is_alias_referenced == false) {
 			if(is_array($config['nat']['rule'])) {
 				foreach($config['nat']['rule'] as $rule) {
+					if($rule['source']['address'] == $alias_name) {
+						$is_alias_referenced = true;
+						$referenced_by = $rule['descr'];
+						break;
+					}
+					if($rule['source']['port'] == $alias_name) {
+						$is_alias_referenced = true;
+						$referenced_by = $rule['descr'];
+						break;
+					}
+					if($rule['destination']['address'] == $alias_name) {
+						$is_alias_referenced = true;
+						$referenced_by = $rule['descr'];
+						break;
+					}
+					if($rule['destination']['port'] == $alias_name) {
+						$is_alias_referenced = true;
+						$referenced_by = $rule['descr'];
+						break;
+					}
 					if($rule['target'] == $alias_name) {
 						$is_alias_referenced = true;
 						$referenced_by = $rule['descr'];
 						break;
 					}
-					if($rule['external-address'] == $alias_name) {
-						$is_alias_referenced = true;
-						$referenced_by = $rule['descr'];
-						break;
-					}
-					if($rule['external-port'] == $alias_name) {
-						$is_alias_referenced = true;
-						$referenced_by = $rule['descr'];
-						break;
-					}
 					if($rule['local-port'] == $alias_name) {
 						$is_alias_referenced = true;
 						$referenced_by = $rule['descr'];
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 598e162aca..695717ffc6 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -268,8 +268,11 @@ if ($_POST) {
 			update_alias_names_upon_change('filter', 'rule', 'source', 'address', $_POST['name'], $origname);
 			update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $_POST['name'], $origname);
 			// NAT Rules
+			update_alias_names_upon_change('nat', 'rule', 'source', 'address', $_POST['name'], $origname);
+			update_alias_names_upon_change('nat', 'rule', 'source', 'port', $_POST['name'], $origname);
+			update_alias_names_upon_change('nat', 'rule', 'destination', 'address', $_POST['name'], $origname);
+			update_alias_names_upon_change('nat', 'rule', 'destination', 'port', $_POST['name'], $origname);
 			update_alias_names_upon_change('nat', 'rule', 'target', '', $_POST['name'], $origname);
-			update_alias_names_upon_change('nat', 'rule', 'external-port', '', $_POST['name'], $origname);
 			update_alias_names_upon_change('nat', 'rule', 'local-port', ''	, $_POST['name'], $origname);
 			// Alias in an alias
 			update_alias_names_upon_change('aliases', 'alias', 'address', ''	, $_POST['name'], $origname);