From ff65318ba52109f4ca7eb83a639ecddda2a8b3fc Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 20 Oct 2014 19:44:24 +0200
Subject: [PATCH] modules/base: attempt to work around Firefox autocomplete
 bugs

Ref: https://dev.openwrt.org/ticket/18176

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 modules/base/luasrc/dispatcher.lua   | 4 ++--
 modules/base/luasrc/view/sysauth.htm | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/base/luasrc/dispatcher.lua b/modules/base/luasrc/dispatcher.lua
index 9e5b78d5e..f7e16e77b 100644
--- a/modules/base/luasrc/dispatcher.lua
+++ b/modules/base/luasrc/dispatcher.lua
@@ -145,8 +145,8 @@ function error500(message)
 end
 
 function authenticator.htmlauth(validator, accs, default)
-	local user = luci.http.formvalue("username")
-	local pass = luci.http.formvalue("password")
+	local user = luci.http.formvalue("luci_username")
+	local pass = luci.http.formvalue("luci_password")
 
 	if user and validator(user, pass) then
 		return user
diff --git a/modules/base/luasrc/view/sysauth.htm b/modules/base/luasrc/view/sysauth.htm
index 7c39f0da5..e87f26c2c 100644
--- a/modules/base/luasrc/view/sysauth.htm
+++ b/modules/base/luasrc/view/sysauth.htm
@@ -27,13 +27,13 @@ You may obtain a copy of the License at
 			<div class="cbi-value">
 				<label class="cbi-value-title"><%:Username%></label>
 				<div class="cbi-value-field">
-					<input class="cbi-input-user" type="text" name="username" value="<%=duser%>" />
+					<input class="cbi-input-user" type="text" name="luci_username" value="<%=duser%>" />
 				</div>
 			</div>
 			<div class="cbi-value cbi-value-last">
 				<label class="cbi-value-title"><%:Password%></label>
 				<div class="cbi-value-field">
-					<input id="focus_password" class="cbi-input-password" type="password" name="password" />
+					<input class="cbi-input-password" type="password" name="luci_password" />
 				</div>
 			</div>
 		</fieldset></fieldset>
@@ -45,7 +45,7 @@ You may obtain a copy of the License at
 	</div>
 </form>
 <script type="text/javascript">//<![CDATA[
-	var input = document.getElementById('focus_password');
+	var input = document.getElementsByName('luci_password')[0];
 	if (input)
 		input.focus();
 //]]></script>
-- 
2.11.0