diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc index 66ef076c0e..6951f56bdd 100755 --- a/usr/local/www/interfaces_wlan.inc +++ b/usr/local/www/interfaces_wlan.inc @@ -1,22 +1,22 @@ -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -85,7 +85,7 @@ function wireless_config_post() { $reqdfields = explode(" ", "mode ssid"); $reqdfieldsn = explode(",", "Mode,SSID"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - + if (!$input_errors) { /* bridge check (hostap only!) */ if ($pconfig['bridge'] && ($pconfig['mode'] != "hostap")) @@ -112,7 +112,7 @@ function wireless_config_post() { $_POST['key' . $i] = "0x" . $_POST['key' . $i]; } continue; - } + } /* 128 bit */ if(strlen($_POST['key' . $i]) == 13) continue; @@ -120,7 +120,7 @@ function wireless_config_post() { /* hex key */ if(stristr($_POST['key' . $i], "0x") == false) { $_POST['key' . $i] = "0x" . $_POST['key' . $i]; - } + } continue; } if(strlen($_POST['key' . $i]) == 28) @@ -137,7 +137,7 @@ function wireless_config_post() { $optcfg['wireless']['protmode'] = $_POST['protmode']; $optcfg['wireless']['ssid'] = $_POST['ssid']; $optcfg['wireless']['channel'] = $_POST['channel']; - $optcfg['wireless']['authmode'] = $_POST['authmode']; + $optcfg['wireless']['authmode'] = $_POST['authmode']; $optcfg['wireless']['txpower'] = $_POST['txpower']; $optcfg['wireless']['distance'] = $_POST['distance']; $optcfg['wireless']['wpa']['macaddr_acl'] = $_POST['macaddr_acl']; @@ -150,12 +150,12 @@ function wireless_config_post() { $optcfg['wireless']['wpa']['passphrase'] = $_POST['passphrase']; $optcfg['wireless']['wpa']['ext_wpa_sw'] = $_POST['ext_wpa_sw']; - if($_POST['hidessid_enable'] == "yes") + if($_POST['hidessid_enable'] == "yes") $optcfg['wireless']['hidessid']['enable'] = true; else unset($optcfg['wireless']['hidessid']['enable']); - if($_POST['mac_acl_enable'] == "yes") + if($_POST['mac_acl_enable'] == "yes") $optcfg['wireless']['wpa']['mac_acl_enable'] = true; else unset($optcfg['wireless']['wpa']['mac_acl_enable']); @@ -164,28 +164,28 @@ function wireless_config_post() { $optcfg['wireless']['wpa']['ieee8021x']['enable'] = true; else unset($optcfg['wireless']['wpa']['ieee8021x']['enable']); - + if($_POST['wpa_strict_rekey'] == "yes") $optcfg['wireless']['wpa']['wpa_strict_rekey'] = true; else unset($optcfg['wireless']['wpa']['wpa_strict_rekey']); - if($_POST['debug_mode'] == "yes") + if($_POST['debug_mode'] == "yes") $optcfg['wireless']['wpa']['debug_mode'] = true; else unset($optcfg['wireless']['wpa']['debug_mode']); - if($_POST['wpa_enable'] == "yes") + if($_POST['wpa_enable'] == "yes") $optcfg['wireless']['wpa']['enable'] = $_POST['wpa_enable'] = true; else unset($optcfg['wireless']['wpa']['enable']); - if($_POST['wep_enable'] == "yes") + if($_POST['wep_enable'] == "yes") $optcfg['wireless']['wep']['enable'] = $_POST['wep_enable'] = true; else unset($optcfg['wireless']['wep']['enable']); - if($_POST['wme_enable'] == "yes") + if($_POST['wme_enable'] == "yes") $optcfg['wireless']['wme']['enable'] = $_POST['wme_enable'] = true; else unset($optcfg['wireless']['wme']['enable']); @@ -195,12 +195,12 @@ function wireless_config_post() { else unset($optcfg['wireless']['pureg']['enable']); - if($_POST['apbridge_enable'] == "yes") + if($_POST['apbridge_enable'] == "yes") $optcfg['wireless']['apbridge']['enable'] = $_POST['apbridge_enable'] = true; else unset($optcfg['wireless']['apbridge']['enable']); - if($_POST['standard'] == "11a Turbo") + if($_POST['standard'] == "11a Turbo") $optcfg['wireless']['turbo']['enable'] = true; else unset($optcfg['wireless']['turbo']['enable']); @@ -217,16 +217,16 @@ function wireless_config_post() { } } } - + return $input_errors; } -if($wancfg['if']) +if($wancfg['if']) $curif = $lancfg['if']; -if($wancfg['if']) +if($wancfg['if']) $curif = $lancfg['if']; -if($optcfg['if']) - $curif = $optcfg['if']; +if($optcfg['if']) + $curif = $optcfg['if']; $wl_modes = get_wireless_modes($curif); @@ -244,11 +244,11 @@ function wireless_config_print() { } } - + - + Wireless configuration @@ -301,6 +301,8 @@ function wireless_config_print() {
When operating as an access point in 802.11g mode allow only 11g-capable stations to associate (11b-only stations are not permitted to associate). + + + Enable WME > @@ -323,8 +327,8 @@ function wireless_config_print() { Setting this option will force the card to NOT broadcast it's SSID
(this might create problems for some clients). - - + + Transmit power @@ -371,30 +375,30 @@ function wireless_config_print() { WEP - > + > Enable WEP - + - + - + - + - + @@ -405,13 +409,13 @@ function wireless_config_print() { 104 (128) bit keys may be entered as 13 ASCII characters or 26 hex digits preceded by '0x'. - + -
     TX key 
Key 1:   >
Key 2:   >
Key 3:   >
Key 4:   >
WPA> + > Enable WPA

- + @@ -444,7 +448,7 @@ function wireless_config_print() { -
   WPA Pre Shared Key 
Enable MAC Filtering> + > Setting this option will enable the use of a mac filterlist to allow/deny association based on mac address