www.usr.com/support/gpl/USR9113_release1.0.tar.gz

[bcm963xx.git] / userapps / broadcom / cfm / html / wlsecurity.html
diff --git a/userapps/broadcom/cfm/html/wlsecurity.html b/userapps/broadcom/cfm/html/wlsecurity.html

index 4e408af..cd76b5f 100755 (executable)
--- a/userapps/broadcom/cfm/html/wlsecurity.html
+++ b/userapps/broadcom/cfm/html/wlsecurity.html
@@ -4,11 +4,11 @@
  -->
  <html>
  <head>
-       <title>Security &raquo; Wireless</title>
+       <title>Wireless &laquo; Security</title>
  
-       <link href="usr_main.css" rel="stylesheet" type="text/css">
-       <link href="usr_menus.css" rel="stylesheet" type="text/css"><script src="usr_menus.js" type="text/javascript"></script><script src="usr_menus_build.js" type="text/javascript"></script>
-       <script src="usr_common.js" type="text/javascript"></script>
+       <link href="usr_layout.css" type="text/css" rel="stylesheet" /><script src="usr_layout.js" type="text/javascript"></script>
+       <link href="usr_menus_dropdown.css" rel="stylesheet" type="text/css"><script src="usr_menus_dropdown.js" type="text/javascript"></script><script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_device.css" type="text/css" rel="stylesheet" /><script src="usr_device.js" type="text/javascript"></script><link href="usr_91xx.css" type="text/css" rel="stylesheet" /><script src="usr_91xx.js" type="text/javascript"></script><script src="usr_resources.js" type="text/javascript"></script>
  
         <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
  
@@ -16,7 +16,7 @@
         <script type="text/javascript">
  <!-- hide
  
-setPageTitle("<%ejGetWlJS(wlInterface)%>");
+
  
  var ssidIdx = '<%ejGetWlJS(wlSsidIdx)%>';
  var enblWireless = '<%ejGetWlJS(wlEnbl)%>';
@@ -40,7 +40,7 @@ var varPreauth = '<%ejGetWlJS(wlPreauth)%>';
  var varNetReauth = <%ejGetWlJS(wlNetReauth)%> / 60;
  
  var bWDS = ("<%ejGetWlJS(wlLazyWds)%>" != "1");
-
+var apMode = "<%ejGetWlJS(wlMode)%>";
  if ( wlRefresh == '1' )
     window.location = "wlsecrefresh.wl?wlRefresh=0";
  
@@ -276,8 +276,11 @@ function authModeChange(bPageLoad)
  
  function frmLoad()
  {
-       // if WDS is on, post notice
-       setVisibility("idWDSon", bWDS);
+   // if WDS is on, post notice
+   setVisibility("idWDSon", bWDS && (apMode == "wds"));
+   // Set default mode to 'None'
+   if ( mode == "open" && wep == "disabled" )
+      mode = "none";     
  
     with ( document.forms[0] ) {
        wlAuthMode.selectedIndex = getAuthModeIndex(mode);
@@ -331,14 +334,15 @@ function btnApply(place)
         */
         if (bWDS)
         {
-               if ((document.forms[0].wlAuthMode.value == "psk2mix") ||
+               if ((apMode == "wds") &&
+                       ((document.forms[0].wlAuthMode.value == "psk2mix") ||
                          (document.forms[0].wlAuthMode.value == "psk2") ||
                          (document.forms[0].wlAuthMode.value == "wpa2mix") ||
                          (document.forms[0].wlAuthMode.value == "wpa2") ||
                          (document.forms[0].wlAuthMode.value == "wpa") ||
                          (document.forms[0].wlAuthMode.value == "radius") ||
                          ((document.forms[0].wlAuthMode.value == "psk") &&
-                         (document.forms[0].wlWpa.value == "tkip+aes")))
+                         (document.forms[0].wlWpa.value == "tkip+aes"))))
                 {
                         alert("Bridge restrict (WDS) is enabled, which means that WPA2, RADIUS, and both TKIP and AES are not allowed.");
                         return;
@@ -539,7 +543,7 @@ on the <a href="wlwds.cmd?action=view">Wireless AP Mode</a> page.</p>
         </tr>
  
         <tr id="wpaPreShareKey">
-               <td><label for="wlWpaPsk">WPA pre-shared key:</label></td>
+               <td><label for="wlWpaPsk">WPA pass phrase:</label></td>
                 <td><input type='text' name='wlWpaPsk' id='wlWpaPsk' size='20' maxlength='64'></td>
         </tr>