Project

General

Profile

« Previous | Next » 

Revision 31f93981

Added by Bill Marquette about 20 years ago

Clean up wierd $config updates here too

View differences:

usr/local/www/system_advanced.php
102 102
		} else {
103 103
			unset($config['system']['disableftpproxy']);
104 104
		}
105
		if($_POST['rfc959workaround'] == "yes") {
105
		if($_POST['rfc959workaround'] == "yes")
106 106
			$config['system']['rfc959workaround'] = "enabled";
107
		else
108
			unset($config['system']['rfc959workaround']);
109

  
110
		if($_POST['filteringbridge_enable'] == "yes")
111
			$config['bridge']['filteringbridge'] = true;
112
		else
113
			unset($config['bridge']['filteringbridge']);
114
		if($_POST['ipv6nat_enable'] == "yes") {
115
			$config['diag']['ipv6nat']['enable'] = true;
116
			$config['diag']['ipv6nat']['ipaddr'] = $_POST['ipv6nat_ipaddr'];
117
		} else {
118
			unset($config['diag']['ipv6nat']['enable']);
119
			unset($config['diag']['ipv6nat']['ipaddr']);
107 120
		}
108
		$config['bridge']['filteringbridge'] = $_POST['filteringbridge_enable'] ? true : false;
109
		$config['diag']['ipv6nat']['enable'] = $_POST['ipv6nat_enable'] ? true : false;
110
		$config['diag']['ipv6nat']['ipaddr'] = $_POST['ipv6nat_ipaddr'];
111 121
		$oldcert = $config['system']['webgui']['certificate'];
112 122
		$oldkey = $config['system']['webgui']['private-key'];
113 123
		$config['system']['webgui']['certificate'] = base64_encode($_POST['cert']);
114 124
		$config['system']['webgui']['private-key'] = base64_encode($_POST['key']);
115
		$config['system']['disableconsolemenu'] = $_POST['disableconsolemenu'] ? true : false;
116
		$config['system']['disablefirmwarecheck'] = $_POST['disablefirmwarecheck'] ? true : false;
117
		$config['system']['altfirmwareurl'] = $_POST['altfirmwareurl'] ? true : false;
125
		if($_POST['disableconsolemenu'] == "yes")
126
			$config['system']['disableconsolemenu'] = true;
127
		else
128
			unset($config['system']['disableconsolemenu']);
129
		if($_POST['disablefirmwarecheck'] == "yes")
130
			$config['system']['disablefirmwarecheck'] = true;
131
		else
132
			unset($config['system']['disablefirmwarecheck']);
133
		if($_POST['altfirmwareurl'] == "yes")
134
			$config['system']['altfirmwareurl'] = true;
135
		else
136
			unset($config['system']['altfirmwareurl']);
118 137
		if ($_POST['altfirmwareurl']) {
119 138
			$config['system']['alt_firmware_url'] = array();
120 139
			$config['system']['alt_firmware_url']['enabled'] = "";
......
137 156
			unset($config['system']['alt_pkgconfig_url']);
138 157
		}
139 158

  
140
		$config['system']['webgui']['expanddiags'] = $_POST['expanddiags'] ? true : false;
159
		if ($_POST['expanddiags'] == "yes")
160
			$config['system']['webgui']['expanddiags'] = true;
161
		else
162
			unset($config['system']['webgui']['expanddiags']);
141 163
		$config['system']['optimization'] = $_POST['optimization'];
142 164
		$config['system']['disablerendevouz'] = $_POST['disablerendevouz'];
143 165
		
144
		$config['system']['enableserial'] = $_POST['enableserial'];
145

  
146
		$oldharddiskstandby = $config['system']['harddiskstandby'];
147
		$config['system']['harddiskstandby'] = $_POST['harddiskstandby'];
148
		$config['system']['webgui']['noantilockout'] = $_POST['noantilockout'] ? true : false;
166
		if ($_POST['enableserial'] == "yes")
167
			$config['system']['enableserial'] == "enabled";
168
		else
169
			unset($config['system']['enableserial']);
170

  
171
		if($_POST['harddiskstandby'] == "yes") {
172
			$config['system']['harddiskstandby'] = "yes";
173
			system_set_harddisk_standby();
174
		} else
175
			unset($config['system']['harddiskstandby']);
176

  
177
		if ($_POST['noantilockout'] == "yes")
178
			$config['system']['webgui']['noantilockout'] = true;
179
		else
180
			unset($config['system']['webgui']['noantilockout']);
149 181

  
150 182
		/* Firewall and ALTQ options */
151 183
		$config['system']['schedulertype'] = $_POST['schedulertype'];
......
158 190
			system_webgui_start();
159 191
		}
160 192

  
161
		system_set_harddisk_standby();
162 193
			
163 194
		$retval = 0;
164 195
		if (!file_exists($d_sysrebootreqd_path)) {

Also available in: Unified diff