From e1e1ab076b99a6cc47fb5fe1e5519a2e686eca45 Mon Sep 17 00:00:00 2001 From: Stephen Beaver Date: Thu, 4 Feb 2016 20:51:25 -0500 Subject: Fixed #5841 --- src/usr/local/www/firewall_rules.php | 4 ++-- src/usr/local/www/firewall_rules_edit.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 556a4c1..0acb6c1 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -221,7 +221,7 @@ if ($_GET['act'] == "del") { unset($a_filter[$_GET['id']]); // Update the separators - $a_separators = &$config['filter']['separator'][$if]; + $a_separators = &$config['filter']['separator'][strtolower($if)]; for ($idx=0; isset($a_separators['sep' . $idx]); $idx++ ) { $seprow = substr($a_separators['sep' . $idx]['row']['0'], 2); @@ -249,7 +249,7 @@ if (isset($_POST['del_x'])) { $deleted = false; if (is_array($_POST['rule']) && count($_POST['rule'])) { - $a_separators = &$config['filter']['separator'][$if]; + $a_separators = &$config['filter']['separator'][strtolower($if)]; foreach ($_POST['rule'] as $rulei) { delete_nat_association($a_filter[$rulei]['associated-rule-id']); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index ba692bb..ad87e18 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -309,6 +309,7 @@ $dnqlist =& get_unique_dnqueue_list(); $a_gatewaygroups = return_gateway_groups_array(); if ($_POST) { + unset($input_errors); if (isset($a_filter[$id]['associated-rule-id'])) { @@ -913,7 +914,7 @@ if ($_POST) { array_splice($a_filter, $after+1, 0, array($filterent)); // Update the separators - $a_separators = &$config['filter']['separator'][$if]; + $a_separators = &$config['filter']['separator'][strtolower($if)]; for ($idx=0; isset($a_separators['sep' . $idx]); $idx++ ) { $seprow = substr($a_separators['sep' . $idx]['row']['0'], 2); -- cgit v1.1