libs/core: further fixes for luci.util.pcdata(), fix wrong character range and drop...

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

diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index ffab60c..79f01a6 100644 (file)
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -31,7 +31,6 @@ local debug = require "debug"
 local ldebug = require "luci.debug"
 local string = require "string"
 local coroutine = require "coroutine"
-local cutil = require "luci.cutil"
 
 local getmetatable, setmetatable = getmetatable, setmetatable
 local rawget, rawset, unpack = rawget, rawset, unpack
@@ -45,7 +44,6 @@ module "luci.util"
 --
 -- Pythonic string formatting extension
 --
---[[
 getmetatable("").__mod = function(a, b)
        if not b then
                return a
@@ -55,7 +53,6 @@ getmetatable("").__mod = function(a, b)
                return a:format(b)
        end
 end
-]]--
 
 
 --
@@ -63,7 +60,6 @@ end
 --
 
 -- Instantiates a class
---[[
 local function _instantiate(class, ...)
        local inst = setmetatable({}, {__index = class})
 
@@ -73,7 +69,6 @@ local function _instantiate(class, ...)
 
        return inst
 end
-]]--
 
 --- Create a Class object (Python-style object model).
 -- The class object can be instantiated by calling itself.
@@ -89,15 +84,12 @@ end
 -- @return             A class object
 -- @see                        instanceof
 -- @see                        clone
---[[
 function class(base)
        return setmetatable({}, {
                __call  = _instantiate,
                __index = base
        })
 end
-]]--
-class = cutil.class
 
 --- Test whether the given object is an instance of the given class.
 -- @param object       Object instance
@@ -201,14 +193,25 @@ 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("[&\"'<>]", {
-               ["&"] = "&#38;",
-               ['"'] = "&#34;",
-               ["'"] = "&#39;",
-               ["<"] = "&#60;",
-               [">"] = "&#62;"
-       })
+       return value and tostring(value):gsub("[&\"'<>%c]", _pcdata_repl)
 end
 
 --- Strip HTML tags from given string.