modules/admin-full: rework fstab pages, include extroot options

[project/luci.git] / modules / admin-full / luasrc / controller / admin / status.lua

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 3a0f040..55bba2f 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -14,16 +14,41 @@ $Id$
 module("luci.controller.admin.status", package.seeall)
 
 function index()
-       luci.i18n.loadc("admin-core")
+       luci.i18n.loadc("base")
        local i18n = luci.i18n.translate
 
-       entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20)
-       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "Systemprotokoll"))
-       entry({"admin", "status", "routes"}, template("admin_status/routes"), "Routingtabelle", 10)
-       entry({"admin", "status", "iwscan"}, template("admin_status/iwscan"), "WLAN-Scan", 20)
+       entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true
+       entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("Interfaces"), 1)
+       entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2)
+       entry({"admin", "status", "conntrack"}, template("admin_status/conntrack"), i18n("Active Connections"), 3)
+       entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 4)
+       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 5)
+       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 6)
+
 end
 
 function action_syslog()
        local syslog = luci.sys.syslog()
        luci.template.render("admin_status/syslog", {syslog=syslog})
-end
\ No newline at end of file
+end
+
+function action_dmesg()
+       local dmesg = luci.sys.dmesg()
+       luci.template.render("admin_status/dmesg", {dmesg=dmesg})
+end
+
+function action_iptables()
+       if luci.http.formvalue("zero") == "1" then
+               luci.util.exec("iptables -Z")
+               luci.http.redirect(
+                       luci.dispatcher.build_url("admin", "status", "iptables")
+               )
+       elseif luci.http.formvalue("restart") == "1" then
+               luci.util.exec("/etc/init.d/firewall restart")
+               luci.http.redirect(
+                       luci.dispatcher.build_url("admin", "status", "iptables")
+               )
+       else
+               luci.template.render("admin_status/iptables")
+       end
+end