* luci/splash: fix #92
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 15 Jul 2008 22:55:25 +0000 (22:55 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 15 Jul 2008 22:55:25 +0000 (22:55 +0000)
applications/luci-splash/luasrc/controller/splash/splash.lua

index 6512ee5..7dbf488 100644 (file)
@@ -9,9 +9,9 @@ function index()
 end
 
 function action_dispatch()
 end
 
 function action_dispatch()
-       local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR"))
+       local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR")) or ""
        local status = luci.sys.execl("luci-splash status "..mac)[1]
        local status = luci.sys.execl("luci-splash status "..mac)[1]
-       if status == "whitelisted" or status == "lease" then
+       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", "splash"))
                luci.http.redirect(luci.dispatcher.build_url())
        else
                luci.http.redirect(luci.dispatcher.build_url("splash", "splash", "splash"))
@@ -26,4 +26,4 @@ function action_activate()
        else
                luci.http.redirect(luci.dispatcher.build_url())
        end
        else
                luci.http.redirect(luci.dispatcher.build_url())
        end
-end
\ No newline at end of file
+end