X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-mini%2Fluasrc%2Fcontroller%2Fmini%2Findex.lua;h=acff55aabb8fd15655ae625f6f7088f97517e830;hb=1ee5ba632ab52b5d3af5c88803fee89c8eaf6fe1;hp=4813b838ef3b8900cec2940e1263b912ad8b48f2;hpb=8815b6a7dd24a481606db03c5980bc310709a103;p=project%2Fluci.git

diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index 4813b838e..acff55aab 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -31,16 +31,22 @@ function index()
 	page.i18n    = "admin-core"
 	page.sysauth = "root"
 	page.sysauth_authenticator = "htmlauth"
-	page.ucidata = true
 	page.index = true
 	
 	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("overview"), 10).index = true
 	entry({"mini", "index", "index"}, form("mini/index"), i18n("general"), 1).ignoreindex = true
-	entry({"mini", "index", "luci"}, cbi("mini/luci"), i18n("settings"), 10)
+	entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("settings"), 10)
 	entry({"mini", "index", "logout"}, call("action_logout"), i18n("logout"))
 end
 
 function action_logout()
-	luci.http.header("Set-Cookie", "sysauth=; path=/")
+	local dsp = require "luci.dispatcher"
+	local sauth = require "luci.sauth"
+	if dsp.context.authsession then
+		sauth.kill(dsp.context.authsession)
+		dsp.context.urltoken.stok = nil
+	end
+
+	luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
 	luci.http.redirect(luci.dispatcher.build_url())
 end
\ No newline at end of file