Changeset 13133

Timestamp:

10/22/09 03:00:19 (1 month ago)

Author:

BrainSlayer

Message:

wifidog authentication support

Files:

• src/router/kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• src/router/services/services/wifidog.c (modified) (1 diff)
• src/router/wifidog/config/2wifidog.webhotspot (modified) (1 diff)
• src/router/wifidog/config/wifidog.nvramconfig (modified) (1 diff)

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

@@ -773 +773 @@
-hotspot.wifidog_authsrvpath="AuthServer Path";
-hotspot.wifidog_config="Firewall Ruleset";
+hotspot.wifidog_messagefile="HTML Message File for Wifidog";
+hotspot.wifidog_realm="HTTP Server Realm";
+hotspot.wifidog_username="HTTP Server Username";
+hotspot.wifidog_password="HTTP Server Password";
+hotspot.wifidog_auth="HTTP Server Authentication Support";
-
-var anchorfree = new Object();

src/router/services/services/wifidog.c

@@ -64 +64 @@
-                        fprintf(fp, "HtmlMessageFile %s\n", nvram_safe_get("wd_messagefile"));
-                }
+                if (nvram_match("wd_auth","1"))
+                    {
+                        if (strlen(nvram_safe_get("wd_realm")) > 0) 
+                        fprintf(fp, "HTTPDRealm %s\n", nvram_safe_get("wd_realm"));
+                        fprintf(fp, "HTTPDUserName %s\n", nvram_safe_get("wd_username"));
+                        fprintf(fp, "HTTPDPassword %s\n", nvram_safe_get("wd_password"));
+                    }
-                fprintf(fp, "Path %s\n", nvram_safe_get("wd_path"));
-                fprintf(fp, "}\n");

src/router/wifidog/config/2wifidog.webhotspot

@@ -96 +96 @@
-                        <input class="text" maxlength="100" size="39" name="wd_path" value="<% nvram_get("wd_path"); %>" />
-                </div>
+                <div class="setting">
+                        <div class="label"><% tran("hotspot.wifidog_auth"); %></div>
+                        <input class="spaceradio" type="radio" name="wd_auth" value="1" <% nvram_checked("wd_auth","1"); %> onclick="show_layer_ext(this, 'idauth', true)" /><% tran("share.enable"); %>&nbsp;
+                        <input class="spaceradio" type="radio" name="wd_auth" value="0" <% nvram_checked("wd_auth","0"); %> onclick="show_layer_ext(this, 'idauth', false)" /><% tran("share.disable"); %> 
+                        <div id="idauth">
+                                <div class="setting">
+                                <div class="label"><% tran("hotspot.wifidog_realm"); %></div>
+                                <input name="wd_realm" size="40" maxlength="63" onblur="valid_name(this,share.usrname)" value="<% nvram_get("wd_realm"); %>" />
+                                <div class="label"><% tran("hotspot.wifidog_username"); %></div>
+                                <input name="wd_username" size="40" maxlength="63" onblur="valid_name(this,share.usrname)" value="<% nvram_get("wd_username"); %>" />
+                                <div class="label"><% tran("hotspot.wifidog_password"); %></div>
+                                <input name="wd_password" size="40" maxlength="63" onblur="valid_name(this,share.passwd)" type="password" value="<% nvram_get("wd_password"); %>" />
+                                <input type="checkbox" name="_wd_password_unmask" value="0" onclick="setElementMask('wd_password', this.checked)" >&nbsp;<% tran("share.unmask"); %></input>
+                        </div>
+                </div>
+        </div>
+<script>
+//<![CDATA
+        show_layer_ext(document.setup.wd_auth, 'idauth', <% nvram_else_match("wd_auth", "1", "1", "0"); %> == 1);
+//]]>
-                <div class="setting">   
-                        <div class="label"><% tran("hotspot.wifidog_messagefile"); %></div>

src/router/wifidog/config/wifidog.nvramconfig

@@ -13 +13 @@
-"wd_path" "Authserver path" "NULL" "TRUE" "0"
-"wd_messagefile" "Wifidog Messagefile" "NULL" "TRUE" "0"
-
+
+
+
+
+