X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fcore%2Fluasrc%2Futil.lua;h=0bce8598534dc3841c670417356a20c2f3e75ec2;hp=53e46a99dc85176b1461720d0446954ad1512e85;hb=8d2c8c131d9e7165b23eda1bb4926e508a523801;hpb=a3cf596d37e4116a7068daaa724270a0898cb7da

diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index 53e46a99d..0bce85985 100644
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -45,7 +45,6 @@ module "luci.util"
 --
 -- Pythonic string formatting extension
 --
---[[
 getmetatable("").__mod = function(a, b)
 	if not b then
 		return a
@@ -55,7 +54,6 @@ getmetatable("").__mod = function(a, b)
 		return a:format(b)
 	end
 end
-]]--
 
 
 --
@@ -63,7 +61,6 @@ end
 --
 
 -- Instantiates a class
---[[
 local function _instantiate(class, ...)
 	local inst = setmetatable({}, {__index = class})
 
@@ -73,7 +70,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 +85,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
@@ -105,7 +98,6 @@ class = cutil.class
 -- @return			Boolean indicating whether the object is an instance
 -- @see				class
 -- @see				clone
---[[
 function instanceof(object, class)
 	local meta = getmetatable(object)
 	while meta and meta.__index do
@@ -116,8 +108,6 @@ function instanceof(object, class)
 	end
 	return false
 end
-]]--
-instanceof = cutil.instanceof
 
 
 --
@@ -204,18 +194,17 @@ 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 _pcdata_repl = {
+                ["&"] = "&",
+                ['"'] = """,
+                ["'"] = "'",
+                ["<"] = "&#60;",
+                [">"] = "&#62;"
+}
+
 function pcdata(value)
-	return value and tostring(value):gsub("[&\"'<>]", {
-		["&"] = "&#38;",
-		['"'] = "&#34;",
-		["'"] = "&#39;",
-		["<"] = "&#60;",
-		[">"] = "&#62;"
-	})
+	return value and tostring(value):gsub("[&\"'<>]", _pcdata_repl)
 end
-]]--
-pcdata = cutil.pcdata
 
 --- Strip HTML tags from given string.
 -- @param value	String containing the HTML text
@@ -271,12 +260,9 @@ end
 --- Remove leading and trailing whitespace from given string value.
 -- @param str	String value containing whitespace padded data
 -- @return		String value with leading and trailing space removed
---[[
 function trim(str)
 	return (str:gsub("^%s*(.-)%s*$", "%1"))
 end
-]]--
-trim = cutil.trim
 
 --- Count the occurences of given substring in given string.
 -- @param str		String to search in