Project

General

Profile

« Previous | Next » 

Revision 6ef2297b

Added by Erik Fonnesbeck over 12 years ago

Add extra checks for reading and saving certain wireless settings and fix an existing check.

View differences:

etc/inc/interfaces.inc
395 395

  
396 396
	if($g['booting'])
397 397
		echo gettext("Creating other wireless clone interfaces...");
398
	if (is_array($config['wireless']['clone']) && count($config['wireless']['clone'])) {
398
	if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone']) && count($config['wireless']['clone'])) {
399 399
		foreach ($config['wireless']['clone'] as $clone) {
400 400
			if(empty($clone['cloneif']))
401 401
				continue;
......
2167 2167
	}
2168 2168

  
2169 2169
	// Read or write settings at shared area
2170
	if (isset($config['wireless']['interfaces'][$baseif])) {
2170
	if (isset($config['wireless']['interfaces'][$baseif]) && is_array($config['wireless']['interfaces'][$baseif])) {
2171 2171
		foreach ($shared_settings as $setting) {
2172 2172
			if ($sync_changes) {
2173 2173
				if (isset($ifcfg['wireless'][$setting]))
......
2184 2184
	}
2185 2185

  
2186 2186
	// Sync the mode on the clone creation page with the configured mode on the interface
2187
	if (interface_is_wireless_clone($ifcfg['if'])) {
2187
	if (interface_is_wireless_clone($ifcfg['if']) && isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) {
2188 2188
		foreach ($config['wireless']['clone'] as &$clone) {
2189 2189
			if ($clone['cloneif'] == $ifcfg['if']) {
2190 2190
				if ($sync_changes) {
......
2557 2557
		$clone_list = array();
2558 2558
		if (does_interface_exist(interface_get_wireless_clone($baseif)))
2559 2559
			$clone_list[] = interface_get_wireless_clone($baseif);
2560
		if (is_array($config['wireless']['clone'])) {
2560
		if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) {
2561 2561
			foreach ($config['wireless']['clone'] as $clone) {
2562 2562
				if ($clone['if'] == $baseif)
2563 2563
					$clone_list[] = $clone['cloneif'];

Also available in: Unified diff