diff options
| -rw-r--r-- | etc/inc/interfaces.inc | 8 | ||||
| -rwxr-xr-x | usr/local/www/interfaces.php | 8 | ||||
| -rw-r--r-- | usr/local/www/interfaces_wireless.php | 2 | ||||
| -rw-r--r-- | usr/local/www/interfaces_wireless_edit.php | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e9e2c95..75058ff 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -395,7 +395,7 @@ function interfaces_create_wireless_clones() { if($g['booting']) echo gettext("Creating other wireless clone interfaces..."); - if (is_array($config['wireless']['clone']) && count($config['wireless']['clone'])) { + if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone']) && count($config['wireless']['clone'])) { foreach ($config['wireless']['clone'] as $clone) { if(empty($clone['cloneif'])) continue; @@ -2167,7 +2167,7 @@ function interface_sync_wireless_clones(&$ifcfg, $sync_changes = false) { } // Read or write settings at shared area - if (isset($config['wireless']['interfaces'][$baseif])) { + if (isset($config['wireless']['interfaces'][$baseif]) && is_array($config['wireless']['interfaces'][$baseif])) { foreach ($shared_settings as $setting) { if ($sync_changes) { if (isset($ifcfg['wireless'][$setting])) @@ -2184,7 +2184,7 @@ function interface_sync_wireless_clones(&$ifcfg, $sync_changes = false) { } // Sync the mode on the clone creation page with the configured mode on the interface - if (interface_is_wireless_clone($ifcfg['if'])) { + if (interface_is_wireless_clone($ifcfg['if']) && isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) { foreach ($config['wireless']['clone'] as &$clone) { if ($clone['cloneif'] == $ifcfg['if']) { if ($sync_changes) { @@ -2557,7 +2557,7 @@ EOD; $clone_list = array(); if (does_interface_exist(interface_get_wireless_clone($baseif))) $clone_list[] = interface_get_wireless_clone($baseif); - if (is_array($config['wireless']['clone'])) { + if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) { foreach ($config['wireless']['clone'] as $clone) { if ($clone['if'] == $baseif) $clone_list[] = $clone['cloneif']; diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index c92b193..7d14829 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -958,7 +958,11 @@ function handle_wireless_post() { $wancfg['wireless']['auth_server_shared_secret2'] = $_POST['auth_server_shared_secret2']; if ($_POST['persistcommonwireless'] == "yes") { - if (is_array($config['wireless']) && is_array($config['wireless']['interfaces']) && !is_array($config['wireless']['interfaces'][$wlanbaseif])) + if (!is_array($config['wireless'])) + $config['wireless'] = array(); + if (!is_array($config['wireless']['interfaces'])) + $config['wireless']['interfaces'] = array(); + if (!is_array($config['wireless']['interfaces'][$wlanbaseif])) $config['wireless']['interfaces'][$wlanbaseif] = array(); } else if (isset($config['wireless']['interfaces'][$wlanbaseif])) unset($config['wireless']['interfaces'][$wlanbaseif]); @@ -1063,7 +1067,7 @@ function check_wireless_mode() { $clone_count = 1; else $clone_count = 0; - if (is_array($config['wireless']['clone'])) { + if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) { foreach ($config['wireless']['clone'] as $clone) { if ($clone['if'] == $wlanbaseif) $clone_count++; diff --git a/usr/local/www/interfaces_wireless.php b/usr/local/www/interfaces_wireless.php index 6bcab95..a6266ad 100644 --- a/usr/local/www/interfaces_wireless.php +++ b/usr/local/www/interfaces_wireless.php @@ -40,6 +40,8 @@ require("guiconfig.inc"); +if (!is_array($config['wireless'])) + $config['wireless'] = array(); if (!is_array($config['wireless']['clone'])) $config['wireless']['clone'] = array(); diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php index ae56add..335fb5b 100644 --- a/usr/local/www/interfaces_wireless_edit.php +++ b/usr/local/www/interfaces_wireless_edit.php @@ -40,6 +40,8 @@ require("guiconfig.inc"); +if (!is_array($config['wireless'])) + $config['wireless'] = array(); if (!is_array($config['wireless']['clone'])) $config['wireless']['clone'] = array(); |
