projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libs/web: add the ability for maps to push error messages to the global page header
[project/luci.git]
/
libs
/
web
/
luasrc
/
dispatcher.lua
diff --git
a/libs/web/luasrc/dispatcher.lua
b/libs/web/luasrc/dispatcher.lua
index
8d5c02e
..
3d0db5a
100644
(file)
--- a/
libs/web/luasrc/dispatcher.lua
+++ b/
libs/web/luasrc/dispatcher.lua
@@
-52,11
+52,25
@@
local fi
-- @return Relative URL
function build_url(...)
local path = {...}
-- @return Relative URL
function build_url(...)
local path = {...}
- local sn = http.getenv("SCRIPT_NAME") or ""
+ local url = { http.getenv("SCRIPT_NAME") or "" }
+
+ local k, v
for k, v in pairs(context.urltoken) do
for k, v in pairs(context.urltoken) do
- sn = sn .. "/;" .. k .. "=" .. http.urlencode(v)
+ url[#url+1] = "/;"
+ url[#url+1] = http.urlencode(k)
+ url[#url+1] = "="
+ url[#url+1] = http.urlencode(v)
+ end
+
+ local p
+ for _, p in ipairs(path) do
+ if p:match("^[a-zA-Z0-9_%-%.%%/,;]+$") then
+ url[#url+1] = "/"
+ url[#url+1] = p
+ end
end
end
- return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "")
+
+ return table.concat(url, "")
end
--- Send a 404 error code and render the "error404" template if available.
end
--- Send a 404 error code and render the "error404" template if available.
@@
-181,7
+195,7
@@
function dispatch(request)
for i, s in ipairs(request) do
local tkey, tval
if t then
for i, s in ipairs(request) do
local tkey, tval
if t then
- tkey, tval = s:match(";(%w+)=(
.
*)")
+ tkey, tval = s:match(";(%w+)=(
[a-fA-F0-9]
*)")
end
if tkey then
end
if tkey then
@@
-704,19
+718,60
@@
local function _cbi(self, ...)
end
end
end
end
- local pageaction = true
http.header("X-CBI-State", state or 0)
http.header("X-CBI-State", state or 0)
+
if not config.noheader then
tpl.render("cbi/header", {state = state})
end
if not config.noheader then
tpl.render("cbi/header", {state = state})
end
+
+ local redirect
+ local messages
+ local applymap = false
+ local pageaction = true
+ local parsechain = { }
+
for i, res in ipairs(maps) do
for i, res in ipairs(maps) do
- res:render()
+ if res.apply_needed and res.parsechain then
+ local c
+ for _, c in ipairs(res.parsechain) do
+ parsechain[#parsechain+1] = c
+ end
+ applymap = true
+ end
+
+ if res.redirect then
+ redirect = redirect or res.redirect
+ end
+
if res.pageaction == false then
pageaction = false
end
if res.pageaction == false then
pageaction = false
end
+
+ if res.message then
+ messages = messages or { }
+ messages[#messages+1] = res.message
+ end
end
end
+
+ for i, res in ipairs(maps) do
+ res:render({
+ firstmap = (i == 1),
+ applymap = applymap,
+ redirect = redirect,
+ messages = messages,
+ pageaction = pageaction,
+ parsechain = parsechain
+ })
+ end
+
if not config.nofooter then
if not config.nofooter then
- tpl.render("cbi/footer", {flow = config, pageaction=pageaction, state = state, autoapply = config.autoapply})
+ tpl.render("cbi/footer", {
+ flow = config,
+ pageaction = pageaction,
+ redirect = redirect,
+ state = state,
+ autoapply = config.autoapply
+ })
end
end
end
end