From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 9 Jul 2009 16:55:41 +0000 (+0000)
Subject: applications/luci-splash: fix mac status query
X-Git-Tag: 0.10.0~1396
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=7d7fcecb7498f214d5fd5ee4c3f1d6b287932307

applications/luci-splash: fix mac status query
---

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)