applications/luci-splash:

[project/luci.git] / applications / luci-splash / luasrc / controller / splash / splash.lua

diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua
index e7448d7..13f9f41 100644 (file)
--- a/applications/luci-splash/luasrc/controller/splash/splash.lua
+++ b/applications/luci-splash/luasrc/controller/splash/splash.lua
@@ -1,30 +1,79 @@
 module("luci.controller.splash.splash", package.seeall)
 
 function index()
-       local page = node("admin", "services", "splash")
-       page.target = cbi("splash/splash")
-       page.title  = "Client-Splash"
-
-       node("splash", "splash", "activate").target = call("action_activate")
-       node("splash", "splash", "allowed").target  = call("action_allowed")
-       node("splash", "splash", "unknown").target  = call("action_unknown")
-       node("splash", "splash", "splash").target   = template("splash_splash/splash")
+       entry({"admin", "services", "splash"}, cbi("splash/splash"), "Client-Splash")
+
+       node("splash").target = call("action_dispatch")
+       node("splash", "activate").target = call("action_activate")
+       node("splash", "splash").target   = template("splash_splash/splash")
+
+       entry({"admin", "status", "splash"}, call("action_status_admin"), "Client-Splash")
+end
+
+function action_dispatch()
+       local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR")) or ""
+       local status = luci.util.execl("luci-splash status "..mac)[1]
+       if #mac > 0 and ( status == "whitelisted" or status == "lease" ) then
+               luci.http.redirect(luci.dispatcher.build_url())
+       else
+               luci.http.redirect(luci.dispatcher.build_url("splash", "splash"))
+       end
 end
 
 function action_activate()
-       local mac = luci.sys.net.ip4mac(luci.http.env.REMOTE_ADDR)
+       local ip = luci.http.getenv("REMOTE_ADDR") or "127.0.0.1"
+       local mac = luci.sys.net.ip4mac(ip:match("^[\[::ffff:]*(%d+.%d+%.%d+%.%d+)\]*$"))
        if mac and luci.http.formvalue("accept") then
-               os.execute("luci-splash add "..mac.." >/dev/null 2>&1")
-               luci.http.redirect(luci.model.uci.get("freifunk", "community", "homepage"))
+               os.execute("luci-splash lease "..mac.." >/dev/null 2>&1")
+               luci.http.redirect(luci.model.uci.cursor():get("freifunk", "community", "homepage"))
        else
                luci.http.redirect(luci.dispatcher.build_url())
        end
 end
 
-function action_allowed()
-       luci.http.redirect(luci.dispatcher.build_url())
-end
+function action_status_admin()
+       local uci = luci.model.uci.cursor_state()
+       local macs = luci.http.formvaluetable("save")
+
+       local changes = { 
+               whitelist = { },
+               blacklist = { },
+               lease     = { },
+               remove    = { }
+       }
 
-function action_unknown()
-       luci.http.redirect(luci.dispatcher.build_url())
-end
\ No newline at end of file
+       for key, _ in pairs(macs) do
+               local policy = luci.http.formvalue("policy.%s" % key)
+               local mac    = luci.http.protocol.urldecode(key)
+
+               if policy == "whitelist" or policy == "blacklist" then
+                       changes[policy][#changes[policy]+1] = mac
+               elseif policy == "normal" then
+                       changes["lease"][#changes["lease"]+1] = mac
+               elseif policy == "kicked" then
+                       changes["remove"][#changes["remove"]+1] = mac
+               end
+       end
+
+       if #changes.whitelist > 0 then
+               os.execute("luci-splash whitelist %s >/dev/null"
+                       % table.concat(changes.whitelist))
+       end
+
+       if #changes.blacklist > 0 then
+               os.execute("luci-splash blacklist %s >/dev/null"
+                       % table.concat(changes.blacklist))
+       end
+
+       if #changes.lease > 0 then
+               os.execute("luci-splash lease %s >/dev/null"
+                       % table.concat(changes.lease))
+       end
+
+       if #changes.remove > 0 then
+               os.execute("luci-splash remove %s >/dev/null"
+                       % table.concat(changes.remove))
+       end
+
+       luci.template.render("admin_status/splash", { is_admin = true })
+end