module("luci.dispatcher", package.seeall)
context = util.threadlocal()
+uci = require "luci.model.uci"
+i18n = require "luci.i18n"
+_M.fs = fs
authenticator = {}
-- @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
- 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
- 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.
assert(conf.main,
"/etc/config/luci seems to be corrupt, unable to find section 'main'")
- local lang = conf.main.lang
+ local lang = conf.main.lang or "auto"
if lang == "auto" then
local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
for lpat in aclang:gmatch("[%w-]+") do
break
end
end
- end
+ end
require "luci.i18n".setlanguage(lang)
local c = ctx.tree
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
end
- ctx.requestpath = freq
+ ctx.requestpath = ctx.requestpath or freq
ctx.path = preq
if track.i18n then
write = luci.http.write;
include = function(name) tpl.Template(name):render(getfenv(2)) end;
translate = function(...) return require("luci.i18n").translate(...) end;
+ export = function(k, v) if tpl.context.viewns[k] == nil then tpl.context.viewns[k] = v end end;
striptags = util.striptags;
+ pcdata = util.pcdata;
media = media;
theme = fs.basename(media);
resource = luci.config.main.resourcebase
end
luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())
ctx.authsession = sid
+ ctx.authuser = user
end
else
luci.http.status(403, "Forbidden")
end
else
ctx.authsession = sess
+ ctx.authuser = user
end
end
ctx.modifiers = modi
-- Load default translation
- require "luci.i18n".loadc("default")
+ require "luci.i18n".loadc("base")
local scope = setmetatable({}, {__index = luci.dispatcher})
end
end
+ local redirect
local pageaction = true
http.header("X-CBI-State", state or 0)
if not config.noheader then
if res.pageaction == false then
pageaction = false
end
+ if res.redirect then
+ redirect = redirect or res.redirect
+ end
end
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