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

Fix array init in setup_wizard.xml. Fixes #9170

Browse Source 
(cherry picked from commit f5f79fcc24)
This commit is contained in:
jim-p 2018-12-05 11:19:24 -05:00
parent b9687e7361
commit 806cf0618f
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/usr/local/www/wizards/setup_wizard.xml
View File

@ -130,8 +130,7 @@
</fields>
<stepbeforeformdisplay>
<![CDATA[
$config['wizardtemp'] = array();
$config['wizardtemp']['system'] = array();
init_config_arr(array('wizardtemp', 'system'));
$config['wizardtemp']['system']['hostname'] = $config['system']['hostname'];
$config['wizardtemp']['system']['domain'] = $config['system']['domain'];
]]>
@ -534,14 +533,7 @@
}
$type = $_POST['selectedtype'];
if (!is_array($config['ppps'])) {
$config['ppps'] = array();
}
if (!is_array($config['ppps']['ppp'])) {
$config['ppps']['ppp'] = array();
}
init_config_arr(array('ppps', 'ppp'));
if (count($config['ppps']['ppp'])) {
foreach ($config['ppps']['ppp'] as $pppid => $ppp) {
if ($ppp['ptpid'] == "0") {
@ -765,8 +757,7 @@
$config['system']['hostname'] = $config['wizardtemp']['system']['hostname'];
$config['system']['domain'] = $config['wizardtemp']['system']['domain'];
if (!empty($config['wizardtemp']['wangateway'])) {
if (!is_array($config['gateways']['gateway_item']))
$config['gateways']['gateway_item'] = array();
init_config_arr(array('gateways', 'gateway_item'));
$found = false;
$defaultgw_found = false;
foreach ($config['gateways']['gateway_item'] as & $gw) {