diff options
| author | Colin Smith <colin@pfsense.org> | 2005-04-02 06:52:11 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-04-02 06:52:11 +0000 |
| commit | 719dd5fe9a33a06b3786897a24b8327532246706 (patch) | |
| tree | 62012f3703a962c63dbd76afff077da16aca79c4 /usr/local/www/system_firmware.php | |
| parent | 16d70dea52472b0d4f9177190f451a95d011805e (diff) | |
| download | pfsense-719dd5fe9a33a06b3786897a24b8327532246706.zip pfsense-719dd5fe9a33a06b3786897a24b8327532246706.tar.gz | |
Remove "cannot determine firmware version" line when alternative URLs are being used unless the version check actually fails.
Diffstat (limited to 'usr/local/www/system_firmware.php')
| -rwxr-xr-x | usr/local/www/system_firmware.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 2741a92..6b4dd9c 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -109,11 +109,12 @@ if ($_POST && !file_exists($d_firmwarelock_path)) { } } else { /* Only check firmware version if we're setup to go against pfsense.org and user wants us to */ - if (!isset($config['system']['disablefirmwarecheck'])) - if(!isset($config['system']['alt_firmware_url']['enabled'])) - $fwinfo = check_firmware_version(); - else + if (!isset($config['system']['disablefirmwarecheck'])) { + $fwinfo = check_firmware_version(); + if(is_null($fwinfo)) { $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."; + } + } } /* upload progress bar id */ |
