diff options
author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-22 23:54:41 -0700 |
---|---|---|
committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-22 23:54:41 -0700 |
commit | b70138167bdeba1709342ccd785165232b0cdb3d (patch) | |
tree | 214876dea062227a9973c3f45f187db1f841b14b /usr/local/www/interfaces.php | |
parent | 658d28bfbb6e4c278c1f3d7374cf19e0831d60e0 (diff) | |
download | pfsense-b70138167bdeba1709342ccd785165232b0cdb3d.zip pfsense-b70138167bdeba1709342ccd785165232b0cdb3d.tar.gz |
Move shared wireless configuration settings to their own heading.
Diffstat (limited to 'usr/local/www/interfaces.php')
-rwxr-xr-x | usr/local/www/interfaces.php | 114 |
1 files changed, 64 insertions, 50 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 16112a2..e66055e 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -215,6 +215,11 @@ if (isset($wancfg['wireless'])) { /* Get wireless modes */ $wlanif = get_real_interface($if); interface_wireless_clone($wlanif, $wancfg); + if(!stristr($wancfg['if'], "_wlan")) { + $wlanbaseif = $wancfg['if']; + } else { + $wlanbaseif = substr($wancfg['if'], 0, stripos($wancfg['if'], "_wlan")); + } $wl_modes = get_wireless_modes($if); $pconfig['standard'] = $wancfg['wireless']['standard']; $pconfig['mode'] = $wancfg['wireless']['mode']; @@ -1236,7 +1241,10 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" <td colspan="2" valign="top" height="16"></td> </tr> <tr> - <td colspan="2" valign="top" class="listtopic">Wireless configuration</td> + <td colspan="2" valign="top" class="listtopic">Common wireless configuration</td> + </tr> + <tr> + <td colspan="2" valign="top" class="vtable">These settings apply to all wireless networks on <?=$wlanbaseif;?>.</td> </tr> <tr> <td valign="top" class="vncellreq">Standard</td> @@ -1254,16 +1262,6 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" </td> </tr> <tr> - <td valign="top" class="vncellreq">Mode</td> - <td class="vtable"> - <select name="mode" class="formselect" id="mode"> - <option <? if ($pconfig['mode'] == 'bss') echo "selected";?> value="bss">Infrastructure (BSS)</option> - <option <? if ($pconfig['mode'] == 'adhoc') echo "selected";?> value="adhoc">Ad-hoc (IBSS)</option> - <option <? if ($pconfig['mode'] == 'hostap') echo "selected";?> value="hostap">Access Point</option> - </select> - </td> - </tr> - <tr> <td valign="top" class="vncellreq">802.11g OFDM Protection Mode</td> <td class="vtable"> <select name="protmode" class="formselect" id="protmode"> @@ -1276,45 +1274,6 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" <br/> </td> </tr> - <tr> - <td valign="top" class="vncellreq">SSID</td> - <td class="vtable"> - <input name="ssid" type="text" class="formfld unknown" id="ssid" size="20" value="<?=htmlspecialchars($pconfig['ssid']); ?>"> - </td> - </tr> - <tr> - <td valign="top" class="vncell">802.11g only</td> - <td class="vtable"> - <input name="pureg_enable" type="checkbox" value="yes" class="formfld" id="pureg_enable" <? if ($pconfig['pureg_enable']) echo "checked";?>> - <br/>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). - </td> - </tr> - <tr> - <td valign="top" class="vncell">Allow intra-BSS communication</td> - <td class="vtable"> - <input name="apbridge_enable" type="checkbox" value="yes" class="formfld" id="apbridge_enable" <? if ($pconfig['apbridge_enable']) echo "checked";?>> - <br/> - When operating as an access point, enable this if you want to pass packets between wireless clients directly. - <br/> - Disabling the internal bridging is useful when traffic is to be processed with packet filtering. - </td> - </tr> - <tr> - <td valign="top" class="vncell">Enable WME</td> - <td class="vtable"> - <input name="wme_enable" type="checkbox" class="formfld" id="wme_enable" value="yes" <? if ($pconfig['wme_enable']) echo "checked";?>> - <br/>Setting this option will force the card to use WME (wireless QoS). - </td> - </tr> - <tr> - <td valign="top" class="vncell">Enable Hide SSID</td> - <td class="vtable"> - <input name="hidessid_enable" type="checkbox" class="formfld" id="hidessid_enable" value="yes" <? if ($pconfig['hidessid_enable']) echo "checked";?>> - <br/> - Setting this option will force the card to NOT broadcast its SSID - <br/> - (this might create problems for some clients). </td> - </tr> <tr> <td valign="top" class="vncellreq">Transmit power</td> <td class="vtable"> @@ -1355,6 +1314,61 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" </td> </tr> <tr> + <td colspan="2" valign="top" height="16"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Wireless configuration</td> + </tr> + <tr> + <td valign="top" class="vncellreq">Mode</td> + <td class="vtable"> + <select name="mode" class="formselect" id="mode"> + <option <? if ($pconfig['mode'] == 'bss') echo "selected";?> value="bss">Infrastructure (BSS)</option> + <option <? if ($pconfig['mode'] == 'adhoc') echo "selected";?> value="adhoc">Ad-hoc (IBSS)</option> + <option <? if ($pconfig['mode'] == 'hostap') echo "selected";?> value="hostap">Access Point</option> + </select> + </td> + </tr> + <tr> + <td valign="top" class="vncellreq">SSID</td> + <td class="vtable"> + <input name="ssid" type="text" class="formfld unknown" id="ssid" size="20" value="<?=htmlspecialchars($pconfig['ssid']); ?>"> + </td> + </tr> + <tr> + <td valign="top" class="vncell">802.11g only</td> + <td class="vtable"> + <input name="pureg_enable" type="checkbox" value="yes" class="formfld" id="pureg_enable" <? if ($pconfig['pureg_enable']) echo "checked";?>> + <br/>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). + </td> + </tr> + <tr> + <td valign="top" class="vncell">Allow intra-BSS communication</td> + <td class="vtable"> + <input name="apbridge_enable" type="checkbox" value="yes" class="formfld" id="apbridge_enable" <? if ($pconfig['apbridge_enable']) echo "checked";?>> + <br/> + When operating as an access point, enable this if you want to pass packets between wireless clients directly. + <br/> + Disabling the internal bridging is useful when traffic is to be processed with packet filtering. + </td> + </tr> + <tr> + <td valign="top" class="vncell">Enable WME</td> + <td class="vtable"> + <input name="wme_enable" type="checkbox" class="formfld" id="wme_enable" value="yes" <? if ($pconfig['wme_enable']) echo "checked";?>> + <br/>Setting this option will force the card to use WME (wireless QoS). + </td> + </tr> + <tr> + <td valign="top" class="vncell">Enable Hide SSID</td> + <td class="vtable"> + <input name="hidessid_enable" type="checkbox" class="formfld" id="hidessid_enable" value="yes" <? if ($pconfig['hidessid_enable']) echo "checked";?>> + <br/> + Setting this option will force the card to NOT broadcast its SSID + <br/> + (this might create problems for some clients). </td> + </tr> + <tr> <td valign="top" class="vncell">Distance setting</td> <td class="vtable"> <input name="distance" type="text" class="formfld unknown" id="distance" size="5" value="<?=htmlspecialchars($pconfig['distance']);?>"> |