summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-splash
diff options
context:
space:
mode:
authorManuel Munz <freifunk@somakoma.de>2012-09-02 19:34:32 +0000
committerManuel Munz <freifunk@somakoma.de>2012-09-02 19:34:32 +0000
commit4f126632a542f9e8948cd58a03c3ccbdee1c0d9e (patch)
treefaaaaa40dedc83c63f506927e9839a20375ee670 /applications/luci-splash
parent81b554b7a0fd2cd8d991b119ff8511af9da75c4a (diff)
applications/splash: Fix error when replacing markers, delete file which contains the custom text if it is empty, #477
Diffstat (limited to 'applications/luci-splash')
-rw-r--r--applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua2
-rw-r--r--applications/luci-splash/luasrc/view/splash/splash.htm10
2 files changed, 6 insertions, 6 deletions
diff --git a/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua b/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
index 82ba0b9dbf..5b744e1ccc 100644
--- 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 18acf30a7c..fbb9c8b759 100644
--- 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%>