X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Findex.lua;h=b7bf36996e7af822d2da0374cefb5951e7adb53b;hp=9583f4f91377ed66d38a414d73fbc8c105bf18ec;hb=13fbce85b4353c1d8cc65b26cee02ec43b24528b;hpb=65cde96c5b05e04c24b0f272b577df67193d7c0b

diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index 9583f4f91..b7bf36996 100644
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -14,37 +14,35 @@ $Id$
 module("luci.controller.admin.index", package.seeall)
 
 function index()
-	luci.i18n.loadc("admin-core")
+	luci.i18n.loadc("base")
 	local i18n = luci.i18n.translate
 
 	local root = node()
 	if not root.target then
 		root.target = alias("admin")
+		root.index = true
 	end
-	
-	entry({"about"}, template("about")).i18n = "admin-core"
-	
+
 	local page   = node("admin")
-	page.target  = alias("admin", "index")
-	page.title   = i18n("administration", "Administration")
+	page.target  = alias("admin", "status")
+	page.title   = i18n("Administration")
 	page.order   = 10
-	page.i18n    = "admin-core"
 	page.sysauth = "root"
+	page.sysauth_authenticator = "htmlauth"
 	page.ucidata = true
-	
-	local page  = node("admin", "index")
-	page.target = template("admin_index/index")
-	page.title  = i18n("overview", "Übersicht")
-	page.order  = 10
-	
-	local page  = node("admin", "index", "luci")
-	page.target = cbi("admin_index/luci")
-	page.title  = i18n("a_i_ui", "Oberfläche")
-	
-	entry({"admin", "index", "logout"}, call("action_logout"), i18n("logout"))
+	page.index = true
+
+	entry({"admin", "logout"}, call("action_logout"), i18n("Logout"), 90)
 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
+end