diff options
author | Ermal Luçi <eri@pfsense.org> | 2009-10-09 18:12:37 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2009-10-09 18:12:37 +0000 |
commit | 7c26752dfcef83d3b957b7127c309fc4ef2e3cc1 (patch) | |
tree | f8f8c4823a186070eaffc456f4a8990341caadbb /etc/rc.filter_synchronize | |
parent | 77514a75122de47e6f877a3f80d7ae54c24270f8 (diff) | |
download | pfsense-7c26752dfcef83d3b957b7127c309fc4ef2e3cc1.zip pfsense-7c26752dfcef83d3b957b7127c309fc4ef2e3cc1.tar.gz |
Revert "Use array_splice() to unset items that should not be sync'd (nosync) Resolves #38"
This reverts commit d6e8dfa1d6b4bad7ef6f71263f275ca8e8b0a706.
Diffstat (limited to 'etc/rc.filter_synchronize')
-rw-r--r-- | etc/rc.filter_synchronize | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 519482b..182a1f1 100644 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -89,58 +89,44 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens if (is_array($config_copy['nat']['advancedoutbound']['rule'])) for ($x = 0; $x < count($config_copy['nat']['advancedoutbound']['rule']); $x++) { $config_copy['nat']['advancedoutbound']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['advancedoutbound']['rule'][$x]['descr']); - if (isset ($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync'])) { - array_splice($config_copy['nat']['advancedoutbound']['rule'],$x,1); - $x--; - } + if (isset ($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync'])) + unset ($config_copy['nat']['advancedoutbound']['rule'][$x]); } if (is_array($config_copy['nat']['rule'])) for ($x = 0; $x < count($config_copy['nat']['rule']); $x++) { $config_copy['nat']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['rule'][$x]['descr']); - if (isset ($config_copy['nat']['rule'][$x]['nosync'])) { - array_splice($config_copy['nat']['rule'],$x,1); - $x--; - } + if (isset ($config_copy['nat']['rule'][$x]['nosync'])) + unset ($config_copy['nat']['rule'][$x]); } if (is_array($config_copy['filter']['rule'])) for ($x = 0; $x < count($config_copy['filter']['rule']); $x++) { $config_copy['filter']['rule'][$x]['descr'] = remove_special_characters($config_copy['filter']['rule'][$x]['descr']); - if (isset ($config_copy['filter']['rule'][$x]['nosync'])) { - array_splice($config_copy['filter']['rule'],$x,1); - $x--; - } + if (isset ($config_copy['filter']['rule'][$x]['nosync'])) + unset ($config_copy['filter']['rule'][$x]); } if (is_array($config_copy['aliases']['alias'])) for ($x = 0; $x < count($config_copy['aliases']['alias']); $x++) { $config_copy['aliases']['alias'][$x]['descr'] = remove_special_characters($config_copy['aliases']['alias'][$x]['descr']); - if (isset ($config_copy['aliases']['alias'][$x]['nosync'])) { - array_splice($config_copy['aliases']['alias'],$x,1); - $x--; - } + if (isset ($config_copy['aliases']['alias'][$x]['nosync'])) + unset ($config_copy['aliases']['alias'][$x]); } if (is_array($config_copy['dnsmasq']['hosts'])) for ($x = 0; $x < count($config_copy['dnsmasq']['hosts']); $x++) { $config_copy['dnsmasq']['hosts'][$x]['descr'] = remove_special_characters($config_copy['dnsmasq']['hosts'][$x]['descr']); - if (isset ($config_copy['dnsmasq']['hosts'][$x]['nosync'])) { - array_splice($config_copy['dnsmasq']['hosts'],$x,1); - $x--; - } + if (isset ($config_copy['dnsmasq']['hosts'][$x]['nosync'])) + unset ($config_copy['dnsmasq']['hosts'][$x]); } if (is_array($config_copy['virtualip']['vip'])) for ($x = 0; $x < count($config_copy['virtualip']['vip']); $x++) { $config_copy['virtualip']['vip'][$x]['descr'] = remove_special_characters($config_copy['virtualip']['vip'][$x]['descr']); - if (isset ($config_copy['virtualip']['vip'][$x]['nosync']) or $config_copy['virtualip']['vip'][$x]['mode'] == "proxyarp") { - array_splice($config_copy['virtualip']['vip'],$x,1); - $x--; - } + if (isset ($config_copy['virtualip']['vip'][$x]['nosync']) or $config_copy['virtualip']['vip'][$x]['mode'] == "proxyarp") + unset ($config_copy['virtualip']['vip'][$x]); } if (is_array($config_copy['ipsec']['tunnel'])) for ($x = 0; $x < count($config_copy['ipsec']['tunnel']); $x++) { $config_copy['ipsec']['tunnel'][$x]['descr'] = remove_special_characters($config_copy['ipsec']['tunnel'][$x]['descr']); - if (isset ($config_copy['ipsec']['tunnel'][$x]['nosync'])) { - array_splice($config_copy['ipsec']['tunnel'],$x,1); - $x--; - } + if (isset ($config_copy['ipsec']['tunnel'][$x]['nosync'])) + unset ($config_copy['ipsec']['tunnel'][$x]); } foreach ($sections as $section) { |