libs/core: explicitely load luci.i18n in network model

[project/luci.git] / libs / core / luasrc / util.lua

diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index 84c63f240409091588a09821e970f2a4df70c7ea..bde803f710612ad09512b7da36d41327111bd71b 100644 (file)
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -31,11 +31,12 @@ local debug = require "debug"
 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
 
@@ -193,25 +194,8 @@ end
 --- 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.
@@ -282,6 +266,36 @@ function cmatch(str, pat)
        return count
 end
 
+--- Return a matching iterator for the given value. The iterator will return
+-- one token per invocation, the tokens are separated by whitespace. If the
+-- input value is a table, it is transformed into a string first. A nil value
+-- will result in a valid interator which aborts with the first invocation.
+-- @param val          The value to scan (table, string or nil)
+-- @return                     Iterator which returns one token per call
+function imatch(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 function() end
+end
+
 --- Parse certain units from the given string and return the canonical integer
 -- value or 0 if the unit is unknown. Upper- or lower case is irrelevant.
 -- Recognized units are:
@@ -525,7 +539,7 @@ function get_bytecode(val)
                code = string.dump( loadstring( "return " .. serialize_data(val) ) )
        end
 
-       return code and strip_bytecode(code)
+       return code -- and strip_bytecode(code)
 end
 
 --- Strips unnescessary lua bytecode from given string. Information like line
@@ -771,19 +785,19 @@ function copcall(f, ...)
 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