libs/core: remove unused luci.util.escape(), map luci.util.striptags() to luci.template.parser.striptags()

This commit is contained in:
Jo-Philipp Wich 2012-11-26 14:26:46 +00:00
parent f7b4fd2979
commit ce8a22d1b4

View file

@ -182,27 +182,18 @@ end
-- String and data manipulation routines -- String and data manipulation routines
-- --
--- Escapes all occurrences of the given character in given string.
-- @param s String value containing unescaped characters
-- @param c String value with character to escape (optional, defaults to "\")
-- @return String value with each occurrence of character escaped with "\"
function escape(s, c)
c = c or "\\"
return s:gsub(c, "\\" .. c)
end
--- Create valid XML PCDATA from given string. --- Create valid XML PCDATA from given string.
-- @param value String value containing the data to escape -- @param value String value containing the data to escape
-- @return String value containing the escaped data -- @return String value containing the escaped data
function pcdata(value) function pcdata(value)
return value and tparser.sanitize_pcdata(tostring(value)) return value and tparser.pcdata(tostring(value))
end end
--- Strip HTML tags from given string. --- Strip HTML tags from given string.
-- @param value String containing the HTML text -- @param value String containing the HTML text
-- @return String with HTML tags stripped of -- @return String with HTML tags stripped of
function striptags(s) function striptags(value)
return pcdata(tostring(s):gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " ")) return value and tparser.striptags(tostring(value))
end end
--- Splits given string on a defined separator sequence and return a table --- Splits given string on a defined separator sequence and return a table
@ -356,7 +347,6 @@ function parse_units(ustr)
end end
-- also register functions above in the central string class for convenience -- also register functions above in the central string class for convenience
string.escape = escape
string.pcdata = pcdata string.pcdata = pcdata
string.striptags = striptags string.striptags = striptags
string.split = split string.split = split