diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 3e390ce96a..335aff0502 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -36,13 +36,8 @@ require_once("filter.inc"); require_once("shaper.inc"); require_once("itemid.inc"); -if (!is_array($config['nat'])) { - $config['nat'] = array(); -} -if (!is_array($config['nat']['rule'])) { - $config['nat']['rule'] = array(); -} - +init_config_arr(array('nat', 'separator')); +init_config_arr(array('nat', 'rule')); $a_nat = &$config['nat']['rule']; /* update rule order, POST[rule] is an array of ordered IDs */ diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index cb9d79bf2b..8e9bf99b32 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -35,10 +35,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); -if (!is_array($config['nat']['onetoone'])) { - $config['nat']['onetoone'] = array(); -} - +init_config_arr(array('nat', 'onetoone')); $a_1to1 = &$config['nat']['onetoone']; /* update rule order, POST[rule] is an array of ordered IDs */ diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index a82af6586e..37cb64f801 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -50,10 +50,7 @@ foreach ($ifdisp as $kif => $kdescr) { $specialsrcdst[] = "{$kif}ip"; } -if (!is_array($config['nat']['onetoone'])) { - $config['nat']['onetoone'] = array(); -} - +init_config_arr(array('nat', 'onetoone')); $a_1to1 = &$config['nat']['onetoone']; if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) { diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 32edb7c279..0caeb317ba 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -46,10 +46,8 @@ foreach ($ifdisp as $kif => $kdescr) { $specialsrcdst[] = "{$kif}ip"; } -if (!is_array($config['nat']['rule'])) { - $config['nat']['rule'] = array(); -} - +init_config_arr(array('nat', 'separator')); +init_config_arr(array('nat', 'rule')); $a_nat = &$config['nat']['rule']; if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) { diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 367b3e20f4..7863c62c13 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -36,10 +36,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); -if (!is_array($config['nat']['npt'])) { - $config['nat']['npt'] = array(); -} - +init_config_arr(array('nat', 'npt')); $a_npt = &$config['nat']['npt']; /* update rule order, POST[rule] is an array of ordered IDs */ diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index df4be71788..fe3e4babdb 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -41,10 +41,7 @@ foreach ($ifdisp as $kif => $kdescr) { $specialsrcdst[] = "{$kif}ip"; } -if (!is_array($config['nat']['npt'])) { - $config['nat']['npt'] = array(); -} - +init_config_arr(array('nat', 'npt')); $a_npt = &$config['nat']['npt']; if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) { diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index ba828d01d7..d8cfb2007c 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -38,17 +38,7 @@ require_once("shaper.inc"); global $FilterIflist; global $GatewaysList; -if (!is_array($config['nat'])) { - $config['nat'] = array(); -} -if (!is_array($config['nat']['outbound'])) { - $config['nat']['outbound'] = array(); -} - -if (!is_array($config['nat']['outbound']['rule'])) { - $config['nat']['outbound']['rule'] = array(); -} - +init_config_arr(array('nat', 'outbound', 'rule')); $a_out = &$config['nat']['outbound']['rule']; // update rule order, POST[rule] is an array of ordered IDs diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index e425a8deca..9eeddacf0e 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -35,27 +35,10 @@ require_once("ipsec.inc"); require_once("filter.inc"); require_once("shaper.inc"); -if (!is_array($config['nat'])) { - $config['nat'] = array(); -} -if (!is_array($config['nat']['outbound'])) { - $config['nat']['outbound'] = array(); -} - -if (!is_array($config['nat']['outbound']['rule'])) { - $config['nat']['outbound']['rule'] = array(); -} - +init_config_arr(array('nat', 'outbound', 'rule')); $a_out = &$config['nat']['outbound']['rule']; -if (!is_array($config['aliases'])) { - $config['aliases'] = array(); -} - -if (!is_array($config['aliases']['alias'])) { - $config['aliases']['alias'] = array(); -} - +init_config_arr(array('aliases', 'alias')); $a_aliases = &$config['aliases']['alias']; if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) {