summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-splash
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-06 20:11:15 +0000
committerSteven Barth <steven@midlink.org>2008-08-06 20:11:15 +0000
commit76982655fa433edd885bbb80bbe74e82fca527e2 (patch)
tree98b1f8cfff0bedaf13795779710123f0194dffc1 /applications/luci-splash
parentb1b0c085de7483c5a778f0056a97da14e87b7f16 (diff)
Moved luci.sys.exec, luci.sys.execl and luci.sys.bigendian to luci.util
Diffstat (limited to 'applications/luci-splash')
-rw-r--r--applications/luci-splash/luasrc/controller/splash/splash.lua2
-rwxr-xr-xapplications/luci-splash/root/usr/sbin/luci-splash4
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua
index 7dbf488a4..dbd266f46 100644
--- a/applications/luci-splash/luasrc/controller/splash/splash.lua
+++ b/applications/luci-splash/luasrc/controller/splash/splash.lua
@@ -10,7 +10,7 @@ end
function action_dispatch()
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.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
diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash
index 72456c01e..0b645fab7 100755
--- a/applications/luci-splash/root/usr/sbin/luci-splash
+++ b/applications/luci-splash/root/usr/sbin/luci-splash
@@ -1,7 +1,7 @@
#!/usr/bin/lua
require("luci.http")
-require("luci.sys")
+require("luci.util")
require("luci.model.uci")
-- Init state session
@@ -140,7 +140,7 @@ end
function listrules()
local cmd = "iptables -t nat -L luci_splash_leases | grep RETURN |"
cmd = cmd .. "egrep -io [0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+"
- return luci.util.split(luci.sys.exec(cmd))
+ return luci.util.split(luci.util.exec(cmd))
end