local ldebug = require "luci.debug"
local string = require "string"
local coroutine = require "coroutine"
+local tparser = require "luci.template.parser"
local getmetatable, setmetatable = getmetatable, setmetatable
local rawget, rawset, unpack = rawget, rawset, unpack
local tostring, type, assert = tostring, type, assert
-local ipairs, pairs, loadstring = ipairs, pairs, loadstring
+local ipairs, pairs, next, loadstring = ipairs, pairs, next, loadstring
local require, pcall, xpcall = require, pcall, xpcall
local collectgarbage, get_memory_limit = collectgarbage, get_memory_limit
--- Create valid XML PCDATA from given string.
-- @param value String value containing the data to escape
-- @return String value containing the escaped data
-local function _pcdata_repl(c)
- local i = string.byte(c)
-
- if ( i >= 0x00 and i <= 0x08 ) or ( i >= 0x0B and i <= 0x0C ) or
- ( i >= 0x0E and i <= 0x1F ) or ( i == 0x7F )
- then
- return ""
-
- elseif ( i == 0x26 ) or ( i == 0x27 ) or ( i == 0x22 ) or
- ( i == 0x3C ) or ( i == 0x3E )
- then
- return string.format("&#%i;", i)
- end
-
- return c
-end
-
function pcdata(value)
- return value and tostring(value):gsub("[&\"'<>%c]", _pcdata_repl)
+ return value and tparser.sanitize_pcdata(tostring(value))
end
--- Strip HTML tags from given string.
-- @param val The value to scan (table, string or nil)
-- @return Iterator which returns one token per call
function imatch(v)
- if v == nil then
- v = ""
- elseif type(v) == "table" then
- v = table.concat(v, " ")
+ if type(v) == "table" then
+ local k = nil
+ return function()
+ k = next(v, k)
+ return v[k]
+ end
+
+ elseif type(v) == "number" or type(v) == "boolean" then
+ local x = true
+ return function()
+ if x then
+ x = false
+ return tostring(v)
+ end
+ end
+
+ elseif type(v) == "userdata" or type(v) == "string" then
+ return tostring(v):gmatch("%S+")
end
- return v:gmatch("%S+")
+ return function() end
end
--- Parse certain units from the given string and return the canonical integer
end
-- Handle return value of protected call
-function handleReturnValue(err, co, status, arg1, arg2, arg3, arg4, arg5)
+function handleReturnValue(err, co, status, ...)
if not status then
- return false, err(debug.traceback(co, arg1), arg1, arg2, arg3, arg4, arg5)
+ return false, err(debug.traceback(co, (...)), ...)
end
if coroutine.status(co) ~= 'suspended' then
- return true, arg1, arg2, arg3, arg4, arg5
+ return true, ...
end
- return performResume(err, co, coroutine.yield(arg1, arg2, arg3, arg4, arg5))
+ return performResume(err, co, coroutine.yield(...))
end
-- Resume execution of protected function call
-function performResume(err, co, arg1, arg2, arg3, arg4, arg5)
- return handleReturnValue(err, co, coroutine.resume(co, arg1, arg2, arg3, arg4, arg5))
+function performResume(err, co, ...)
+ return handleReturnValue(err, co, coroutine.resume(co, ...))
end