From 978fd2e812453268712d4bae07b3f685976f7d6b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 21 Sep 2009 19:12:35 -0400
Subject: Pass origname instead of relying on a global

---
 usr/local/www/diag_backup.php           | 12 ++++++------
 usr/local/www/firewall_aliases_edit.php | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index bb8a533..21f4cc2 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -325,14 +325,14 @@ if ($_POST) {
 												// Firewall rules
 												$origname = $config['interfaces'][$iface]['descr'];
 												$newname  = $config['interfaces'][$iface]['descr'] . "Alias";
-												update_alias_names_upon_change('filter', 'rule', 'source', 'address', $newname);
-												update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $newname);
+												update_alias_names_upon_change('filter', 'rule', 'source', 'address', $newname, $origname);
+												update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $newname, $origname);
 												// NAT Rules
-												update_alias_names_upon_change('nat', 'rule', 'target', '', $newname);
-												update_alias_names_upon_change('nat', 'rule', 'external-port', '', $newname);
-												update_alias_names_upon_change('nat', 'rule', 'local-port', '', $newname);
+												update_alias_names_upon_change('nat', 'rule', 'target', '', $newname, $origname);
+												update_alias_names_upon_change('nat', 'rule', 'external-port', '', $newname, $origname);
+												update_alias_names_upon_change('nat', 'rule', 'local-port', '', $newname, $origname);
 												// Alias in an alias
-												update_alias_names_upon_change('aliases', 'alias', 'address', '', $newname);
+												update_alias_names_upon_change('aliases', 'alias', 'address', '', $newname, $origname);
 											}
 										}
 									}
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index ee0f71b..7664d04 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -257,14 +257,14 @@ if ($_POST) {
 		 */
 		if ($_POST['name'] <> $_POST['origname']) {
 			// Firewall rules
-			update_alias_names_upon_change('filter', 'rule', 'source', 'address', $_POST['name']);
-			update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $_POST['name']);
+			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', 'target', '', $_POST['name']);
-			update_alias_names_upon_change('nat', 'rule', 'external-port', '', $_POST['name']);
-			update_alias_names_upon_change('nat', 'rule', 'local-port', ''	, $_POST['name']);
+			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']);
+			update_alias_names_upon_change('aliases', 'alias', 'address', ''	, $_POST['name'], $origname);
 		}
 
 		if (isset($id) && $a_aliases[$id]) {
-- 
cgit v1.1