X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fdispatcher.lua;h=28c460858d65be9d54a90f084bf53bac75656b99;hp=6445c124ed5ee0fc076bccad528f7577ddcf7290;hb=39578a6b72782d8d39b0450346bf0fa1bbb909a1;hpb=8f2a3f1dccee6a0b7ca99ac24458aa9c8987e131

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 6445c124e..28c460858 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -34,6 +34,9 @@ local nixio = require "nixio", require "nixio.util"
 
 module("luci.dispatcher", package.seeall)
 context = util.threadlocal()
+uci = require "luci.model.uci"
+i18n = require "luci.i18n"
+_M.fs = fs
 
 authenticator = {}
 
@@ -49,11 +52,25 @@ local fi
 -- @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.
@@ -146,7 +163,7 @@ function dispatch(request)
 	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
@@ -156,7 +173,7 @@ function dispatch(request)
 				break
 			end
 		end
-        end
+	end
 	require "luci.i18n".setlanguage(lang)
 
 	local c = ctx.tree
@@ -178,7 +195,7 @@ function dispatch(request)
 	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
@@ -234,6 +251,7 @@ function dispatch(request)
 		   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;
@@ -439,16 +457,16 @@ function createindex_plain(path, suffixes)
 	index = {}
 
 	for i,c in ipairs(controllers) do
-		local module = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
+		local modname = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
 		for _, suffix in ipairs(suffixes) do
-			module = module:gsub(suffix.."$", "")
+			modname = modname:gsub(suffix.."$", "")
 		end
 
-		local mod = require(module)
+		local mod = require(modname)
 		local idx = mod.index
 
 		if type(idx) == "function" then
-			index[module] = idx
+			index[modname] = idx
 		end
 	end
 
@@ -475,7 +493,7 @@ function createtree()
 	ctx.modifiers = modi
 
 	-- Load default translation
-	require "luci.i18n".loadc("default")
+	require "luci.i18n".loadc("base")
 
 	local scope = setmetatable({}, {__index = luci.dispatcher})
 
@@ -700,19 +718,60 @@ local function _cbi(self, ...)
 		end
 	end
 
-	local pageaction = true
 	http.header("X-CBI-State", state or 0)
+
 	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
-		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.message then
+			messages = messages or { }
+			messages[#messages+1] = res.message
+		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
-		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