Project

General

Profile

« Previous | Next » 

Revision bb9ea524

Added by Colin Smith over 20 years ago

Modify alternate firmware URL fields to handle new config.xml directive.

View differences:

usr/local/www/system_advanced.php
44 44
$pconfig['disableconsolemenu'] = isset($config['system']['disableconsolemenu']);
45 45
$pconfig['disablefirmwarecheck'] = isset($config['system']['disablefirmwarecheck']);
46 46
$pconfig['altfirmwareurl'] = $config['system']['altfirmwareurl'];
47
$pconfig['firmwareurl'] = $config['system']['firmwareurl'];
48
$pconfig['firmwarename'] = $config['system']['firmwarename'];
47
$pconfig['firmware_base_url'] = $config['system']['alt_firmware_url']['firmware_base_url'];
48
$pconfig['firmwarename'] = $config['system']['alt_firmware_url']['firmware_filename'];
49 49
$pconfig['expanddiags'] = isset($config['system']['webgui']['expanddiags']);
50 50
if ($g['platform'] == "generic-pc")
51 51
	$pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
......
109 109
		$config['system']['disablefirmwarecheck'] = $_POST['disablefirmwarecheck'] ? true : false;
110 110
		$config['system']['altfirmwareurl'] = $_POST['altfirmwareurl'] ? true : false;
111 111
		if ($config['system']['altfirmwareurl']) {
112
			$config['system']['firmwareurl'] = $_POST['firmwareurl'];
113
			$config['system']['firmwarename'] = $_POST['firmwarename'];
112
			$config['system']['alt_firmware_url'] = array();
113
			$config['system']['alt_firmware_url']['enabled'] = "";
114
			$config['system']['alt_firmware_url']['firmware_base_url'] = $_POST['firmwareurl'];
115
			$config['system']['alt_firmware_url']['firmware_filename'] = $_POST['firmwarename'];
114 116
		} else {
115
			unset($config['system']['firmwareurl']);
116
			unset($config['system']['firmwarename']);
117
			unset($config['system']['alt_firmware_url']);
117 118
		}
118 119
		$config['system']['webgui']['expanddiags'] = $_POST['expanddiags'] ? true : false;
119 120
		$config['system']['optimization'] = $_POST['optimization'];

Also available in: Unified diff