applications/luci-splash: Per default redirect to the page the user requested after he accepted the splash. This can be overwritten with redirect_url in the general section in luci_splash config, #595

2 files changed, 43 insertions, 1 deletions

diff --git a/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh b/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
index cbffaf6ab..76f6d4d3e 100755
--- a/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
+++ b/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
@@ -1,4 +1,15 @@
 #!/bin/sh
+
+$(uci -q get luci_splash.general.redirect_url) || {
+	set -x
+	touch /var/state/luci_splash_locations
+	touch /etc/config/luci_splash_locations
+	MAC=$(grep "$REMOTE_HOST" /proc/net/arp | awk '{print $4}')
+	uci -P /var/state set luci_splash_locations.${MAC//:/}=redirect
+	uci -P /var/state set luci_splash_locations.${MAC//:/}.location="http://${HTTP_HOST}${REQUEST_URI}"
+	set +x
+}
+
 echo -en "Cache-Control: no-cache, max-age=0, no-store, must-revalidate\r\n"
 echo -en "Pragma: no-cache\r\n"
 echo -en "Expires: -1\r\n"
@@ -21,3 +32,4 @@ cat <<EOT
 </WISPAccessGatewayParam>
 EOT
 
+
diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua
index 73584580d..97d040082 100644
--- a/applications/luci-splash/luasrc/controller/splash/splash.lua
+++ b/applications/luci-splash/luasrc/controller/splash/splash.lua
@@ -53,6 +53,7 @@ end
 function action_activate()
 	local ip = luci.http.getenv("REMOTE_ADDR") or "127.0.0.1"
 	local mac = luci.sys.net.ip4mac(ip:match("^[\[::ffff:]*(%d+.%d+%.%d+%.%d+)\]*$"))
+	local uci_state = require "luci.model.uci".cursor_state()
 	local blacklisted = false
 	if mac and luci.http.formvalue("accept") then
 		uci:foreach("luci_splash", "blacklist",
@@ -61,8 +62,16 @@ function action_activate()
 		if blacklisted then	
 			luci.http.redirect(luci.dispatcher.build_url("splash" ,"blocked"))
 		else
+			local redirect_url = uci:get("luci_splash", "general", "redirect_url")
+			if not redirect_url then
+				redirect_url = uci_state:get("luci_splash_locations", mac:gsub(':', ''):lower(), "location")
+			end
+			if not redirect_url then
+				redirect_url = luci.model.uci.cursor():get("freifunk", "community", "homepage") or 'http://www.freifunk.net'
+			end
+			remove_redirect(mac:gsub(':', ''):lower())
 			os.execute("luci-splash lease "..mac.." >/dev/null 2>&1")
-			luci.http.redirect(luci.model.uci.cursor():get("freifunk", "community", "homepage"))
+			luci.http.redirect(redirect_url)
 		end
 	else
 		luci.http.redirect(luci.dispatcher.build_url())
@@ -119,3 +128,24 @@ end
 function action_status_public()
 	luci.template.render("admin_status/splash", { is_admin = false })
 end
+
+function remove_redirect(mac)
+	local mac = mac:lower()
+	mac = mac:gsub(":", "")
+	local uci = require "luci.model.uci".cursor_state()
+	local redirects = uci:get_all("luci_splash_locations")
+	--uci:load("luci_splash_locations")
+	uci:revert("luci_splash_locations")
+	-- For all redirects
+	for k, v in pairs(redirects) do
+		if v[".type"] == "redirect" then
+			if v[".name"] ~= mac then
+				-- Rewrite state
+				uci:section("luci_splash_locations", "redirect", v[".name"], {
+					location = v.location
+				})
+			end
+		end
+	end
+	uci:save("luci_splash_redirects")
+end