diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2012-12-08 18:02:48 -0700 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2012-12-08 18:02:48 -0700 |
| commit | 6ef2297b859e0d8723891c16a910674338d16065 (patch) | |
| tree | 80eb8dee095e46df9716adf079b39ee5a34835c2 /usr/local/www | |
| parent | 6ca4713aaa95ed2bd99e41c1e083ed0cf97aedab (diff) | |
| download | pfsense-6ef2297b859e0d8723891c16a910674338d16065.zip pfsense-6ef2297b859e0d8723891c16a910674338d16065.tar.gz | |
Add extra checks for reading and saving certain wireless settings and fix an existing check.
Diffstat (limited to 'usr/local/www')
| -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 |
3 files changed, 10 insertions, 2 deletions
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(); |
