From f1ac1733362f22aa14930d3ac83579bd29ff082d Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Sun, 13 Feb 2011 06:44:22 -0700
Subject: In update_alias_names_upon_change function add capability to access
 more deeply nested sections and fields.

---
 usr/local/www/diag_backup.php           | 15 ++++++---------
 usr/local/www/firewall_aliases_edit.php | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 5892f06..598f4d6 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -355,17 +355,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, $origname);
-												update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $newname, $origname);
+												update_alias_names_upon_change(array('filter', 'rule'), array('source', 'address'), $newname, $origname);
+												update_alias_names_upon_change(array('filter', 'rule'), array('destination', 'address'), $newname, $origname);
 												// NAT Rules
-												update_alias_names_upon_change('nat', 'rule', 'source', 'address', $newname, $origname);
-												update_alias_names_upon_change('nat', 'rule', 'source', 'port', $newname, $origname);
-												update_alias_names_upon_change('nat', 'rule', 'destination', 'address', $newname, $origname);
-												update_alias_names_upon_change('nat', 'rule', 'destination', 'port', $newname, $origname);
-												update_alias_names_upon_change('nat', 'rule', 'target', '', $newname, $origname);
-												update_alias_names_upon_change('nat', 'rule', 'local-port', '', $newname, $origname);
+												update_alias_names_upon_change(array('nat', 'rule'), array('source', 'address'), $newname, $origname);
+												update_alias_names_upon_change(array('nat', 'rule'), array('destination', 'address'), $newname, $origname);
+												update_alias_names_upon_change(array('nat', 'rule'), array('target'), $newname, $origname);
 												// Alias in an alias
-												update_alias_names_upon_change('aliases', 'alias', 'address', '', $newname, $origname);
+												update_alias_names_upon_change(array('aliases', 'alias'), array('address'), $newname, $origname);
 											}
 										}
 									}
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 7307366..48e86d4 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -293,19 +293,19 @@ if ($_POST) {
 		 */
 		if ($_POST['name'] <> $_POST['origname']) {
 			// Firewall rules
-			update_alias_names_upon_change('filter', 'rule', 'source', 'address', $_POST['name'], $origname);
-			update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $_POST['name'], $origname);
-			update_alias_names_upon_change('filter', 'rule', 'source', 'port', $_POST['name'], $origname);
-			update_alias_names_upon_change('filter', 'rule', 'destination', 'port', $_POST['name'], $origname);
+			update_alias_names_upon_change(array('filter', 'rule'), array('source', 'address'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('filter', 'rule'), array('destination', 'address'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('filter', 'rule'), array('source', 'port'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('filter', 'rule'), array('destination', 'port'), $_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', 'local-port', ''	, $_POST['name'], $origname);
+			update_alias_names_upon_change(array('nat', 'rule'), array('source', 'address'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('nat', 'rule'), array('source', 'port'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('nat', 'rule'), array('destination', 'address'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('nat', 'rule'), array('destination', 'port'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('nat', 'rule'), array('target'), $_POST['name'], $origname);
+			update_alias_names_upon_change(array('nat', 'rule'), array('local-port'), $_POST['name'], $origname);
 			// Alias in an alias
-			update_alias_names_upon_change('aliases', 'alias', 'address', ''	, $_POST['name'], $origname);
+			update_alias_names_upon_change(array('aliases', 'alias'), array('address'), $_POST['name'], $origname);
 		}
 
 		if (isset($id) && $a_aliases[$id]) {
-- 
cgit v1.1