summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Smith <colin@pfsense.org>2005-03-16 01:39:59 +0000
committerColin Smith <colin@pfsense.org>2005-03-16 01:39:59 +0000
commitbb9ea5246182977beba0deee4967ca017ad80ac0 (patch)
tree84f6832f2adfb8c8dbbd88433ed6f681b2ff6538
parentc5adbc2cfb4ffb01323f8537501f24edcb551f22 (diff)
downloadpfsense-bb9ea5246182977beba0deee4967ca017ad80ac0.zip
pfsense-bb9ea5246182977beba0deee4967ca017ad80ac0.tar.gz
Modify alternate firmware URL fields to handle new config.xml directive.
-rwxr-xr-xusr/local/www/system_advanced.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index 628d2e2..c8cbb93 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -44,8 +44,8 @@ $pconfig['key'] = base64_decode($config['system']['webgui']['private-key']);
$pconfig['disableconsolemenu'] = isset($config['system']['disableconsolemenu']);
$pconfig['disablefirmwarecheck'] = isset($config['system']['disablefirmwarecheck']);
$pconfig['altfirmwareurl'] = $config['system']['altfirmwareurl'];
-$pconfig['firmwareurl'] = $config['system']['firmwareurl'];
-$pconfig['firmwarename'] = $config['system']['firmwarename'];
+$pconfig['firmware_base_url'] = $config['system']['alt_firmware_url']['firmware_base_url'];
+$pconfig['firmwarename'] = $config['system']['alt_firmware_url']['firmware_filename'];
$pconfig['expanddiags'] = isset($config['system']['webgui']['expanddiags']);
if ($g['platform'] == "generic-pc")
$pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
@@ -109,11 +109,12 @@ if ($_POST) {
$config['system']['disablefirmwarecheck'] = $_POST['disablefirmwarecheck'] ? true : false;
$config['system']['altfirmwareurl'] = $_POST['altfirmwareurl'] ? true : false;
if ($config['system']['altfirmwareurl']) {
- $config['system']['firmwareurl'] = $_POST['firmwareurl'];
- $config['system']['firmwarename'] = $_POST['firmwarename'];
+ $config['system']['alt_firmware_url'] = array();
+ $config['system']['alt_firmware_url']['enabled'] = "";
+ $config['system']['alt_firmware_url']['firmware_base_url'] = $_POST['firmwareurl'];
+ $config['system']['alt_firmware_url']['firmware_filename'] = $_POST['firmwarename'];
} else {
- unset($config['system']['firmwareurl']);
- unset($config['system']['firmwarename']);
+ unset($config['system']['alt_firmware_url']);
}
$config['system']['webgui']['expanddiags'] = $_POST['expanddiags'] ? true : false;
$config['system']['optimization'] = $_POST['optimization'];
OpenPOWER on IntegriCloud