diff options
author | Colin Smith <colin@pfsense.org> | 2005-03-16 01:21:26 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-03-16 01:21:26 +0000 |
commit | c5adbc2cfb4ffb01323f8537501f24edcb551f22 (patch) | |
tree | 5799619a4e3e846ee8fbae173b604973729f8f35 /usr/local/www/system_firmware.php | |
parent | f764e94828b11580f1c31761b90546e487a838ad (diff) | |
download | pfsense-c5adbc2cfb4ffb01323f8537501f24edcb551f22.zip pfsense-c5adbc2cfb4ffb01323f8537501f24edcb551f22.tar.gz |
Add <alt_firmware_url> config file entry and handle it properly.
Diffstat (limited to 'usr/local/www/system_firmware.php')
-rwxr-xr-x | usr/local/www/system_firmware.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index c445f6a..34aabeb 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -83,9 +83,9 @@ if($_POST) { $http_auth_password = $config['system']['proxy_auth_password']; /* custom firmware option */ - if (isset($config['system']['altfirmwareurl'])) { - $firmwareurl=$config['system']['firmwareurl']; - $firmwarename=$config['system']['firmwarename']; + if (isset($config['system']['alt_firmware_url']['enabled'])) { + $firmwareurl=$config['system']['alt_firmware_url']['firmware_base_url']; + $firmwarename=$config['system']['alt_firmware_url']['firmware_filename']; } else { $firmwareurl=$g['firmwarebaseurl']; $firmwarename=$g['firmwarefilename']; @@ -168,7 +168,7 @@ if ($_POST && !file_exists($d_firmwarelock_path)) { if(!isset($config['system']['altfirmwareurl'])) $fwinfo = check_firmware_version(); else - $fwinfo = "Using alternate firmware URL, cannot determine if {$config['system']['firmwareurl']}{$config['system']['firmwarename']} is newer than current."; + $fwinfo = "Using alternate firmware URL, cannot determine if {$config['system']['alt_firmware_url']['firmware_base_url']}{$config['system']['alt_firmware_url']['firmware_filename']} is newer than current."; } ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |