diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-04-04 21:31:00 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-04-04 21:31:00 +0000 |
| commit | 02b8eb37dabd8970c7c6b51a7f2a361557427872 (patch) | |
| tree | 03d967ada1819304dce1b17804da34105ccbffee | |
| parent | 63c2f16935673b0489bb537f14f668fea354a6fb (diff) | |
| download | pfsense-02b8eb37dabd8970c7c6b51a7f2a361557427872.zip pfsense-02b8eb37dabd8970c7c6b51a7f2a361557427872.tar.gz | |
Fix auto upgrade.
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index b5d433d..9ca6a3a 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -980,11 +980,11 @@ function make_dirs($path, $mode = 0755) * auto_upgrade(): Upgrade pfSense to the latest firmware version. */ function auto_upgrade() { - global $config; + global $config, $g; $http_auth_username = ""; $http_auth_password = ""; - if($config['system']['proxy_auth_username']) $http_auth_username = $config['system']['proxy_auth_username']; - if($config['system']['proxy_auth_password']) $http_auth_password = $config['system']['proxy_auth_password']; + if($config['system']['proxy_auth_username'] <> "") $http_auth_username = $config['system']['proxy_auth_username']; + if($config['system']['proxy_auth_password'] <> "") $http_auth_password = $config['system']['proxy_auth_password']; 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']; @@ -1031,12 +1031,12 @@ function check_firmware_version() { $resp .= $line; } } - + fclose($rfd); - + if($_GET['autoupgrade'] <> "") return; - + return $resp; } |
