applications/splash: Fix error when replacing markers, delete file which contains...

diff --git a/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua b/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
index 82ba0b9dbf8a611941302d5aaa602bfdb99ce4d7..5b744e1ccc4c67a108bac6520dd3d970ca5cc596 100644 (file)
--- a/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
+++ b/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
@@ -33,6 +33,8 @@ function f.handle(self, state, data)
        if state == FORM_VALID then
                if data.text then
                        fs.writefile(splashtextfile, data.text:gsub("\r\n", "\n"))
+               else
+                       fs.unlink(splashtextfile)
                end
        end
        return true

diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm
index 18acf30a7c3f551d59994b2973fd1c27f13263e3..fbb9c8b75996bed6e7d7485f629bc308f62c29b7 100644 (file)
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash/splash.htm
@@ -14,11 +14,11 @@ You may obtain a copy of the License at
 local fs = require "luci.fs"
 local has_custom_splash = fs.access("/usr/lib/luci-splash/splashtext.html")
 
-function expand (e)        
+function expand (e, R)        
        return (string.gsub(e, "###([A-Z_]+)###", R))
 end
 
-local community, homepage, leasetime, limit_up, limit_down, R
+local community, homepage, leasetime, limit_up, limit_down
 
 local contacturl = luci.dispatcher.build_url("freifunk", "contact")
 
@@ -50,8 +50,7 @@ if limit_up and limit_down then
 end
 
 if has_custom_splash then
-
-       R = {
+       local R = {
                COMMUNITY = community,
                COMMUNITY_URL = homepage,
                LEASETIME = leasetime,
@@ -59,8 +58,7 @@ if has_custom_splash then
                LIMIT = limit_text,
                CONTACTURL = contacturl
        }
-
-       local splashtext = expand(fs.readfile("/usr/lib/luci-splash/splashtext.html"))
+       local splashtext = expand(fs.readfile("/usr/lib/luci-splash/splashtext.html"), R)
        %>
        <%=splashtext%>