diff options
| author | Colin Smith <colin@pfsense.org> | 2005-03-16 04:07:37 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-03-16 04:07:37 +0000 |
| commit | 0e809364e3e33f75be0ecb06cc9a0e981ef534d5 (patch) | |
| tree | 54e01c62158997aa4fb579ec5f3ccaa4331903ea /usr/local | |
| parent | ef4550f83f159a182ed98b0b80174726b9eddeae (diff) | |
| download | pfsense-0e809364e3e33f75be0ecb06cc9a0e981ef534d5.zip pfsense-0e809364e3e33f75be0ecb06cc9a0e981ef534d5.tar.gz | |
Set and unset <enabled> flag correctly (to preserve URL information) and fix field greyout.
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/www/pkg_mgr.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/system_advanced.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 6be591e..1f4269f 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -73,8 +73,8 @@ include("fbegin.inc"); // Allow package location to be overriden $config_location = "http://www.pfsense.com/packages/pkg_config.xml"; -if(isset($config['system']['alt_pkg_url'])) - $config_location = $config['system']['alt_pkg_url']; +if(isset($config['system']['alt_pkg_url']['enabled'])) + $config_location = $config['system']['alt_pkg_url']['pkgconfig_base_url'] . $config['system']['alt_pkg_url']['pkgconfig_filename']; if(!file_exists("{$g['tmp_path']}/pkg_config.xml")) { mwexec("cd {$g['tmp_path']} && /usr/bin/fetch \"" . $config_location . "\" >/dev/null 2>&1 "); diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index c8cbb93..2c858fe 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -43,7 +43,7 @@ $pconfig['cert'] = base64_decode($config['system']['webgui']['certificate']); $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['altfirmwareurl'] = $config['system']['altfirmwareurl']['enabled']; $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']); @@ -108,11 +108,13 @@ if ($_POST) { $config['system']['disableconsolemenu'] = $_POST['disableconsolemenu'] ? true : false; $config['system']['disablefirmwarecheck'] = $_POST['disablefirmwarecheck'] ? true : false; $config['system']['altfirmwareurl'] = $_POST['altfirmwareurl'] ? true : false; - if ($config['system']['altfirmwareurl']) { + if ($_POST['altfirmwareurl']) { $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']; + } elseif (isset($config['system']['alt_firmware_url']['firmware_base_url']) || isset($config['system']['alt_firmware_url']['firmware_filename'])) { + unset($config['system']['alt_firmware_url']['enabled']); } else { unset($config['system']['alt_firmware_url']); } |
