Changeset 17792

Timestamp:

10/19/11 15:48:59 (19 months ago)

Author:

BrainSlayer

Message:

wps GUI adjustments

Location:

src/router

Files:

• httpd/visuals/ejwps.c (modified) (1 diff)
• kromo/dd-wrt/AOSS.asp (modified) (1 diff)
• kromo/dd-wrt/AOSS.live.asp (modified) (1 diff)
• kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• services/networking/madwifi.c (modified) (2 diffs)

src/router/httpd/visuals/ejwps.c

@@ -30 +30 @@
         return;
 }
+
+void ej_get_wpsconfigure(webs_t wp, int argc, char_t ** argv) {
+        if (nvram_match("wps_status", "0")) 
+                websWrite(wp, "<input class=\"button\" type=\"button\" value=\"%s\" onclick=\"to_configure(this.form);\" />", live_translate("aoss.configure"));
+        else
+                websWrite(wp, "<input class=\"button\" type=\"button\" value=\"%s\" onclick=\"to_forcerelease(this.form);\" />", live_translate("aoss.release"));
+}
 #endif

src/router/kromo/dd-wrt/AOSS.asp

@@ -264 +264 @@
                                                 <div class="label"><% tran("aoss.wpsstatus"); %></div>
                                                 <span id="wpsstatus"><% get_wpsstatus(); %></span>
-                                                <script type="text/javascript">
-                                                //<![CDATA[
-                                                if(!parseInt(<% nvram_get("wps_status"); %>))
-                                                        document.write("<input class=\"button\" type=\"button\" value=\"" + aoss.configure + "\" onclick=\"to_configure(this.form);\" />");
-                                                else
-                                                        document.write("<input class=\"button\" type=\"button\" value=\"" + aoss.release + "\" onclick=\"to_forcerelease(this.form);\" />");
-                                                //]]>
-                                                </script>
+                                                <span id="wpsconfigure"><% get_wpsconfigure(); %></span>
                                         </div>
                                 </fieldset>

src/router/kromo/dd-wrt/AOSS.live.asp

@@ -2 +2 @@
 {uptime::<% get_uptime(); %>}
 {ipinfo::<% show_wanipinfo(); %>}
+{wpsconfigure::<% get_wpsconfigure(); %>}

src/router/kromo/dd-wrt/lang_pack/english.js

@@ -1858 +1858 @@
 aoss.wpsgenerate="Generate PIN";
 aoss.pinnotvalid="Invalid PIN, checksum not correct!";
-aoss.wpsenable="WPS Button";
+aoss.wpsenable="WPS Push Button";
 aoss.wpsstatus="WPS Status";
 aoss.externalregistrar="External Registrar";

src/router/services/networking/madwifi.c

@@ -755 +755 @@
 {
 #ifdef HAVE_WPS
+        char *config_methods = safe_malloc(sizeof("label display keypad") + 1);
+        memset(config_methods, 0, strlen(config_methods));
+        strcpy(config_methods, "label display keypad");
         fprintf(fp, "ctrl_interface=/var/run/hostapd\n");       // for cli
         if (!strcmp(prefix, "ath0")
             || !strcmp(prefix, "ath1")) {
                 fprintf(fp, "eap_server=1\n");
-
+                if (nvram_match("wps_enabled", "1")) {
+                        config_methods = (char *)realloc(config_methods, strlen(config_methods) + sizeof(" push_button") + 1);
+                        strcat(config_methods, " push_button");
+                }
 //# WPS configuration (AP configured, do not allow external WPS Registrars)
                 if (nvram_match("wps_forcerelease", "1")) {
@@ -812 +818 @@
                 fprintf(fp, "os_version=01020300\n");
                 fprintf(fp, "friendly_name=DD-WRT WPS Access Point\n");
-                fprintf(fp,
-                        "config_methods=label display push_button keypad\n");
-        }
+                fprintf(fp, "config_methods=%s\n", config_methods);
+                //      "config_methods=label display push_button keypad\n");
+        }
+        free(config_methods);
 #endif