diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-12-28 23:47:22 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-12-28 23:47:22 +0000 |
| commit | 1cea5083d5e51bb46509225c937f0114089af019 (patch) | |
| tree | 71a67d19e4421a2981af28207d1fce1299eb02d5 /etc | |
| parent | 17a2bc02fef109dd364c850a2e6a30b4bc2bb280 (diff) | |
| download | pfsense-1cea5083d5e51bb46509225c937f0114089af019.zip pfsense-1cea5083d5e51bb46509225c937f0114089af019.tar.gz | |
Renumber, assign and delete rules as needed.
Observed-by: Vacum via irc
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 11efe75..4b3f3b2 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1672,20 +1672,23 @@ function cleanup_opt_interfaces_after_removal($opt_interface_num) { fclose($fd); $config = parse_config(true); /* loop through and delete old rules */ - $num_rules = array_count_values($config['filter']['rule']); + $num_rules = count($config['filter']['rule']); for($x = $num_rules; $x > 0; $x--) { - if($config['filter']['rule'][$x]['interface'] == "optXXXX") - unset($config['filter']['rule'][$x]['interface']); + if($config['filter']['rule'][$x]) + if($config['filter']['rule'][$x]['interface'] == "optXXXX") + unset($config['filter']['rule'][$x]['interface']); } - $num_rules = array_count_values($config['nat']['advancedoutbound']['rule']); + $num_rules = count($config['nat']['advancedoutbound']['rule']); for($x = $num_rules; $x > 0; $x--) { - if($config['nat']['advancedoutbound']['rule'][$x]['interface'] == "optXXXX") - unset($config['nat']['advancedoutbound']['rule'][$x]['interface']); + if($config['nat']['advancedoutbound']['rule'][$x]) + if($config['nat']['advancedoutbound']['rule'][$x]['interface'] == "optXXXX") + unset($config['nat']['advancedoutbound']['rule'][$x]['interface']); } - $num_rules = array_count_values($config['nat']['rule']); + $num_rules = count($config['nat']['rule']); for($x = $num_rules; $x > 0; $x--) { - if($config['nat']['rule'][$x]['interface'] == "optXXXX") - unset($config['nat']['rule'][$x]['interface']); + if($config['nat']['rule'][$x]) + if($config['nat']['rule'][$x]['interface'] == "optXXXX") + unset($config['nat']['rule'][$x]['interface']); } conf_mount_ro(); config_unlock(); |
