* applications/luci-splash: Removed dependency to sgi-haserl, Updated attributes

5 files changed, 8 insertions, 7 deletions

diff --git a/applications/luci-splash/root/etc/cron.minutely/luci_splash b/applications/luci-splash/root/etc/cron.minutely/luci_splash
index eae4294741..eae4294741 100644..100755
--- a/applications/luci-splash/root/etc/cron.minutely/luci_splash
+++ b/applications/luci-splash/root/etc/cron.minutely/luci_splash
diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash
index 20f7865fd4..20f7865fd4 100644..100755
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-splash/root/etc/init.d/luci_splash
diff --git a/applications/luci-splash/root/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi b/applications/luci-splash/root/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi
index 22cab67cc8..29679a21cf 100644..100755
--- a/applications/luci-splash/root/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi
+++ b/applications/luci-splash/root/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi
@@ -1,6 +1,5 @@
-#!/usr/bin/haserl --shell=luac
+#!/usr/bin/lua
 
-require("luci.http")
 require("luci.sys")
 require("luci.model.uci")
 
@@ -8,7 +7,7 @@ luci.model.uci.set_savedir(luci.model.uci.savedir_state)
 
 local srv
 local net
-local ip = luci.http.env.REMOTE_ADDR
+local ip = os.getenv("REMOTE_ADDR")
 luci.model.uci.foreach("network", "interface",
 	function (section)
 		if section.ipaddr then
@@ -30,10 +29,11 @@ luci.model.uci.foreach("luci_splash", "iface",
 	end)
 
 if not srv then
-	luci.http.prepare_content("text/plain")
+	print("Content-Type: text/plain\n")
 	print("Unable to detect network settings!")
 elseif not stat then
-	luci.http.redirect("http://" .. srv)
+	print("Status: 302 Found")
+	print("Location: http://" .. srv)
 else
 	local action = "splash"
 	
@@ -48,5 +48,6 @@ else
 		action = "allowed"
 	end
 	
-	luci.http.redirect("http://" .. srv .. "/cgi-bin/luci-splash/" .. action)
-end
\ No newline at end of file
+	print("Status: 302 Found")
+	print("Location: http://" .. srv .. "/cgi-bin/luci-splash/" .. action)
+end
diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash
index 72456c01e6..72456c01e6 100644..100755
--- a/applications/luci-splash/root/usr/sbin/luci-splash
+++ b/applications/luci-splash/root/usr/sbin/luci-splash
diff --git a/applications/luci-splash/root/www/cgi-bin/luci-splash b/applications/luci-splash/root/www/cgi-bin/luci-splash
index c75593fbe1..c75593fbe1 100644..100755
--- a/applications/luci-splash/root/www/cgi-bin/luci-splash
+++ b/applications/luci-splash/root/www/cgi-bin/luci-splash