diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-07-09 16:55:41 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-07-09 16:55:41 +0000 |
| commit | 7d7fcecb7498f214d5fd5ee4c3f1d6b287932307 (patch) | |
| tree | 4a89b071ed73a6e70fc69eea08596be61de12dfb /applications/luci-splash | |
| parent | 6bfe0624b69defeba37cadffc6afa5ccb9577add (diff) | |
applications/luci-splash: fix mac status query
Diffstat (limited to 'applications/luci-splash')
| -rw-r--r-- | applications/luci-splash/luasrc/controller/splash/splash.lua | 4 | ||||
| -rwxr-xr-x | applications/luci-splash/root/usr/sbin/luci-splash | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua index 13f9f4121..3519a03af 100644 --- a/applications/luci-splash/luasrc/controller/splash/splash.lua +++ b/applications/luci-splash/luasrc/controller/splash/splash.lua @@ -12,8 +12,8 @@ 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 + local status = luci.util.execl("luci-splash status " .. mac)[1] + if #mac > 0 and ( status == "whitelist" or status == "lease" ) then luci.http.redirect(luci.dispatcher.build_url()) else luci.http.redirect(luci.dispatcher.build_url("splash", "splash")) diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash index 017cfebfc..1adcb0932 100755 --- a/applications/luci-splash/root/usr/sbin/luci-splash +++ b/applications/luci-splash/root/usr/sbin/luci-splash @@ -29,7 +29,7 @@ function main(argv) limit_down = tonumber(uci:get("luci_splash", "general", "limit_down")) or 0 if ( cmd == "lease" or cmd == "add-rules" or cmd == "remove" or - cmd == "whitelist" or cmd == "blacklist" ) and #argv > 0 + cmd == "whitelist" or cmd == "blacklist" or cmd == "status" ) and #argv > 0 then lock() @@ -59,6 +59,11 @@ function main(argv) elseif whitelist_macs[mac] then add_whitelist_rule(mac) end + elseif mac and cmd == "status" then + print(leased_macs[mac] and "lease" + or whitelist_macs[mac] and "whitelist" + or blacklist_macs[mac] and "blacklist" + or "new") elseif mac and ( cmd == "whitelist" or cmd == "blacklist" or cmd == "lease" ) then if cmd ~= "lease" and leased_macs[mac] then print("Removing %s from leases" % mac) |