mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Array initialization in NAT pages. Fixes #9080

Browse Source 
(cherry picked from commit 42ad3b8b51)
This commit is contained in:
jim-p 2018-10-30 10:24:09 -04:00
parent b77f0bf131
commit f989b4f6ce
8 changed files with 11 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/usr/local/www/firewall_nat.php
View File

@ -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 */

5
src/usr/local/www/firewall_nat_1to1.php
View File

@ -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 */

5
src/usr/local/www/firewall_nat_1to1_edit.php
View File

@ -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'])) {

6
src/usr/local/www/firewall_nat_edit.php
View File

@ -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'])) {

5
src/usr/local/www/firewall_nat_npt.php
View File

@ -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 */

5
src/usr/local/www/firewall_nat_npt_edit.php
View File

@ -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'])) {

12
src/usr/local/www/firewall_nat_out.php
View File

@ -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

21
src/usr/local/www/firewall_nat_out_edit.php
View File

@ -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'])) {