Firewall / Rules - Consolidate Move Separators Function

Consolidate the moving of separators for add/copy/dup/delete into a generic function.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 94374ca..16fb991 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -921,20 +921,11 @@ if ($_POST) {
 					$tmpif = $if;
 				}
 
-				// get rule index within interface
-				$ifridx = ifridx($tmpif, $after);
-
 				// Update the separators
 				$a_separators = &$config['filter']['separator'][strtolower($tmpif)];
-
-				for ($idx=0; isset($a_separators['sep' . $idx]); $idx++ ) {
-					$seprow = substr($a_separators['sep' . $idx]['row']['0'], 2);
-
-					// If the separator is located after the place where the new rule is to go, increment the separator row
-					if ($seprow > $ifridx) {
-						$a_separators['sep' . $idx]['row']['0'] = 'fr' . ($seprow + 1);
-					}
-				}
+				$ridx = ifridx($tmpif, $after);	// get rule index within interface
+				$mvnrows = +1;
+				move_separators($a_separators, $ridx, $mvnrows);
 			} else {
 				$a_filter[] = $filterent;
 			}