diff options
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 | ||||
| -rwxr-xr-x | usr/local/www/diag_backup.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 36abc54..db15675 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1798,8 +1798,8 @@ if(!function_exists("split")) { } } -function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, $new_alias_name) { - global $g, $config, $pconfig, $origname, $debug; +function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, $new_alias_name, $origname) { + global $g, $config, $pconfig, $debug; if(!$origname) return; 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]) { |
