From: Steven Barth <steven@midlink.org>
Date: Wed, 11 Jun 2008 20:27:10 +0000 (+0000)
Subject: * applications/luci-splash: Removed dependency to sgi-haserl, Updated attributes
X-Git-Tag: 0.8.0~831
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=92a919d8eec152aa1803e328aff68a3b3c283e77

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

diff --git a/applications/luci-splash/root/etc/cron.minutely/luci_splash b/applications/luci-splash/root/etc/cron.minutely/luci_splash
old mode 100644
new mode 100755
diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
index 22cab67cc..29679a21c
--- 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
old mode 100644
new mode 100755
diff --git a/applications/luci-splash/root/www/cgi-bin/luci-splash b/applications/luci-splash/root/www/cgi-bin/luci-splash
old mode 100644
new mode 100755
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 7557c827e..af662f8cb 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -282,7 +282,7 @@ endef
 
 define Package/luci-app-splash
   $(call Package/luci/fftemplate)
-  DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
+  DEPENDS+=+iptables-mod-nat +iptables-mod-ipopt
   TITLE:=Freifunk DHCP-Splash application
 endef
 
@@ -292,11 +292,6 @@ endef
 
 define Package/luci-app-splash/install
 	$(call Package/luci/install/template,$(1),applications/luci-splash)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/sbin/luci-splash $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/init.d/luci_splash $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/cron.minutely/luci_splash $(1)/etc/cron.minutely
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/www/cgi-bin/luci-splash $(1)/www/cgi-bin/luci-splash
 endef