summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2016-09-21 12:08:23 -0400
committerSteve Beaver <sbeaver@netgate.com>2016-09-21 12:10:37 -0400
commit7dd9db776b4b57908d0f2748e82f420f97405831 (patch)
treeb53fbdfe78e9c7025ac2ec82d9811eb0f10c965c
parent02a4d8581ad94d2ceca0f9f27ccab94607fe2645 (diff)
downloadpfsense-7dd9db776b4b57908d0f2748e82f420f97405831.zip
pfsense-7dd9db776b4b57908d0f2748e82f420f97405831.tar.gz
Fixed #6801
(cherry picked from commit 00098bc80b6f85eb74f2f3bc2b4eb7430614110d)
-rw-r--r--src/usr/local/www/firewall_rules.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index bc2d5ae..dfc49ef 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -253,6 +253,7 @@ if (isset($_POST['del_x'])) {
if (is_array($_POST['rule']) && count($_POST['rule'])) {
$a_separators = &$config['filter']['separator'][strtolower($if)];
+ $num_deleted = 0;
foreach ($_POST['rule'] as $rulei) {
delete_nat_association($a_filter[$rulei]['associated-rule-id']);
@@ -260,9 +261,11 @@ if (isset($_POST['del_x'])) {
$deleted = true;
// Update the separators
- $ridx = ifridx($if, $rulei); // get rule index within interface
+ // As rules are deleted, $ridx has to be decremented or separator position will break
+ $ridx = ifridx($if, $rulei) - $num_deleted; // get rule index within interface
$mvnrows = -1;
move_separators($a_separators, $ridx, $mvnrows);
+ $num_deleted++;
}
if ($deleted) {
OpenPOWER on IntegriCloud