Changeset 10727

Timestamp:

11/01/08 13:56:37 (5 years ago)

Author:

BrainSlayer

Message:

fixes selection issues

File:

• src/router/httpd/visuals/dd-wrt.c (modified) (6 diffs)

src/router/httpd/visuals/dd-wrt.c

@@ -3160 +3160 @@
                    "" );
     
-    if (nvram_nmatch("n","%s_phytypes",prefix))
-    if( nvram_nmatch("ab" "%s_bandlist", prefix ) || nvram_nmatch("ba", "%s_bandlist", prefix ) || nvram_nmatch( "a","%s_bandlist", prefix ) )
+    if( has_mimo( prefix ) )
+    {
+    char band[64];
+    sprintf(band,"%s_bandlist",prefix);
+    char *b=nvram_safe_get(band);
+    if (contains(b,'a'))
     {
         websWrite( wp,
@@ -3173 +3177 @@
                                 "na-only" ) ? "selected=\\\"selected\\\"" :
                    "" );
+    }
     }
 #else
@@ -3999 +4004 @@
                "<div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.label3)</script></div><input name=\"%s\" size=\"20\" maxlength=\"32\" onblur=\"valid_name(this,wl_basic.label3)\" value=\"%s\" /></div>\n",
                wl_ssid, nvram_safe_get( wl_ssid ) );
-
+    
 #ifdef HAVE_MADWIFI
     showRadio( wp, "wl_basic.radar", wl_doth );
@@ -4010 +4015 @@
         if( has_mimo( prefix )
             && ( nvram_nmatch( "n-only", "%s_net_mode", prefix )
-                 || nvram_nmatch( "mixed," "%s_net_mode", prefix ) || nvram_nmatch( "na-only," "%s_net_mode", prefix ) ) )
+                 || nvram_nmatch( "mixed," "%s_net_mode", prefix ) || nvram_nmatch( "na-only", "%s_net_mode", prefix ) ) )
         {
 
@@ -4016 +4021 @@
             websWrite( wp,
                        "<div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.channel_width)</script></div>\n" );
-            websWrite( wp, "<select name=\"wl0_nbw\">\n" );
+            websWrite( wp, "<select name=\"%s_nbw\">\n",prefix );
             websWrite( wp,
                        "<script type=\"text/javascript\">\n//<![CDATA[\n document.write(\"<option value=\\\"0\\\" %s >\" + share.auto + \"</option>\");\n//]]>\n</script>\n",
-                       nvram_match( "wl0_nbw",
-                                    "0" ) ? "selected=\\\"selected\\\"" :
+                       nvram_nmatch( "0","%s_nbw",
+                                    prefix) ? "selected=\\\"selected\\\"" :
                        "" );
             websWrite( wp, "<option value=\"10\" %s>10 MHz</option>",
-                       nvram_match( "wl0_nbw",
-                                    "10" ) ? "selected=\\\"selected\\\"" :
+                       nvram_nmatch( "10","%s_nbw",
+                                    prefix) ? "selected=\\\"selected\\\"" :
                        "" );
             websWrite( wp, "<option value=\"20\" %s>20 MHz</option>",
-                       nvram_match( "wl0_nbw",
-                                    "20" ) ? "selected=\\\"selected\\\"" :
+                       nvram_nmatch( "20","%s_nbw",prefix) ? "selected=\\\"selected\\\"" :
                        "" );
             websWrite( wp, "<option value=\"40\" %s>40 MHz</option>",
-                       nvram_match( "wl0_nbw",
-                                    "40" ) ? "selected=\\\"selected\\\"" :
+                       nvram_nmatch("40", "%s_nbw",prefix) ? "selected=\\\"selected\\\"" :
                        "" );
             websWrite( wp, "</select>\n" );
@@ -4040 +4043 @@
             websWrite( wp,
                        "<div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.channel_wide)</script></div>\n" );
-            websWrite( wp, "<select name=\"wl0_wchannel\" ></select>\n" );
+            websWrite( wp, "<select name=\"%s_wchannel\" ></select>\n",prefix );
             websWrite( wp, "</div>\n" );