From: Steven Barth <steven@midlink.org>
Date: Sun, 27 Apr 2008 21:04:58 +0000 (+0000)
Subject: * Fixed Freifunk wizard
X-Git-Tag: 0.8.0~1096
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=a48593c14516ef8a953eed9c36f2d57d5cc9fa00

* Fixed Freifunk wizard
---

diff --git a/module/admin-core/src/controller/admin/index.lua b/module/admin-core/src/controller/admin/index.lua
index 685478edd..ba582cf5c 100644
--- a/module/admin-core/src/controller/admin/index.lua
+++ b/module/admin-core/src/controller/admin/index.lua
@@ -53,14 +53,26 @@ function configure_freifunk()
 		uci:set("network", "ffdhcp", "proto", "static")
 		uci:set("network", "ffdhcp", "ifname", "br-ff:dhcp")
 		uci:set("network", "ffdhcp", "ipaddr", dhcpip)
-		uci:set("network", "ffdhcp", "netmask", uci:get("freifunk", "community", "dhcpmask")) 		
+		uci:set("network", "ffdhcp", "netmask", uci:get("freifunk", "community", "dhcpmask"))
+		
+		local splash = uci:show("luci_splash")
+		if splash then
+			for k, v in pairs(splash.luci_splash) do
+				if v[".type"] == "iface" then
+					uci:del("luci_splash", k)
+				end
+			end		
+			
+			local sk = uci:add("luci_splash", "iface")
+			uci:set("luci_splash", sk, "network", "ffdhcp")
+		end 		
 	end
 	
 	-- Configure OLSR
 	if ffluci.http.formvalue("olsr") and uci:show("olsr") then
 		for k, v in pairs(uci:show("olsr").olsr) do
 			if v[".type"] == "Interface" or v[".type"] == "LoadPlugin" then
-				uci:del("olsr", "k")
+				uci:del("olsr", k)
 			end
 		end