From 1031fe1425a566a1e34d09070a510b5eb4025f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Fri, 17 Apr 2015 10:45:20 +0200
Subject: [PATCH] Added encrypted backup support to web gui.

---
 luci2/luci2/htdocs/luci2/template/system.upgrade.htm | 1 +
 luci2/luci2/htdocs/luci2/view/system.upgrade.js      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/luci2/luci2/htdocs/luci2/template/system.upgrade.htm b/luci2/luci2/htdocs/luci2/template/system.upgrade.htm
index e9b8d3aba..de2cbbd1e 100644
--- a/luci2/luci2/htdocs/luci2/template/system.upgrade.htm
+++ b/luci2/luci2/htdocs/luci2/template/system.upgrade.htm
@@ -14,6 +14,7 @@
 				<p>
 					<form action="/cgi-bin/luci-backup" method="post" style="display:inline">
 						<input type="hidden" name="sessionid" />
+						<input type="hidden" name="password" />
 						<input class="btn btn-primary" type="button" id="btn_backup" value="<%:Generate archive%>" />
 					</form>
 					<input class="btn btn-danger" type="button" id="btn_reset" value="<%:Perform reset%>" />
diff --git a/luci2/luci2/htdocs/luci2/view/system.upgrade.js b/luci2/luci2/htdocs/luci2/view/system.upgrade.js
index d5f24ff3b..98ca58e0f 100644
--- a/luci2/luci2/htdocs/luci2/view/system.upgrade.js
+++ b/luci2/luci2/htdocs/luci2/view/system.upgrade.js
@@ -249,8 +249,9 @@ L.ui.view.extend({
 					
 					form.find('[name=sessionid]').val(L.globals.sid);
 					form.find('[name=password]').val(password); 
-					form.find('[name=password2]').val(password2); 
 					form.submit();
+					
+					L.ui.dialog(false);
 				}
 			}
 		);