diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-09-04 17:43:01 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-09-04 17:43:01 +0000 |
| commit | 16f9b3918e02d5891611ef2fe4280e3bbd095b66 (patch) | |
| tree | 5145901cf2c05ed6a72dd9cbda0a742c98cc0f08 /usr | |
| parent | 4dc589efd21565ea73606e060779b6b614061771 (diff) | |
| download | pfsense-16f9b3918e02d5891611ef2fe4280e3bbd095b66.zip pfsense-16f9b3918e02d5891611ef2fe4280e3bbd095b66.tar.gz | |
More array checks.
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/interfaces_wlan.inc | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc index 8b7567e..5e8facb 100755 --- a/usr/local/www/interfaces_wlan.inc +++ b/usr/local/www/interfaces_wlan.inc @@ -63,7 +63,8 @@ function wireless_config_init(&$optcfg) { $pconfig['wep_enable'] = isset($optcfg['wireless']['wep']['enable']); $pconfig['mac_acl'] = $optcfg['wireless']['mac_acl']; - if (is_array($optcfg['wireless']['wep'])) { + if (is_array($optcfg['wireless']['wep']) && + is_array($optcfg['wireless']['wep']['key'])) { $i = 1; foreach ($optcfg['wireless']['wep']['key'] as $wepkey) { $pconfig['key' . $i] = $wepkey['value']; @@ -179,29 +180,43 @@ function wireless_config_post(&$optcfg) { else unset($optcfg['wireless']['wpa']['enable']); - if($_POST['wep_enable'] == "yes") + if($_POST['wep_enable'] == "yes") { + if (!is_array($optcfg['wireless']['wep'])) + $optcfg['wireless']['wep'] = array(); $optcfg['wireless']['wep']['enable'] = $_POST['wep_enable'] = true; - else + } else unset($optcfg['wireless']['wep']['enable']); - if($_POST['wme_enable'] == "yes") + + if($_POST['wme_enable'] == "yes") { + if (!is_array($optcfg['wireless']['wme'])) + $optcfg['wireless']['wme'] = array(); $optcfg['wireless']['wme']['enable'] = $_POST['wme_enable'] = true; - else + } else unset($optcfg['wireless']['wme']['enable']); - if($_POST['pureg_enable'] == "yes") + + if($_POST['pureg_enable'] == "yes") { + if (!is_array($optcfg['wireless']['pureg'])) + $optcfg['wireless']['pureg'] = array(); $optcfg['wireless']['pureg']['enable'] = $_POST['pureg_enable'] = true; - else + } else unset($optcfg['wireless']['pureg']['enable']); - if($_POST['apbridge_enable'] == "yes") + + if($_POST['apbridge_enable'] == "yes") { + if (!is_array($optcfg['wireless']['apbridge'])) + $optcfg['wireless']['apbridge'] = array(); $optcfg['wireless']['apbridge']['enable'] = $_POST['apbridge_enable'] = true; - else + } else unset($optcfg['wireless']['apbridge']['enable']); - if($_POST['standard'] == "11a Turbo") + + if($_POST['standard'] == "11a Turbo") { + if (!is_array($optcfg['wireless']['turbo'])) + $optcfg['wireless']['turbo'] = array(); $optcfg['wireless']['turbo']['enable'] = true; - else + } else unset($optcfg['wireless']['turbo']['enable']); $optcfg['wireless']['wep']['key'] = array(); |
