libs/core: make luci.util.spairs(), kspairs() and vspairs() return the sequential...

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

diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index bde803f..da761e2 100644 (file)
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -4,9 +4,6 @@ LuCI - Utility library
 Description:
 Several common useful Lua functions
 
-FileId:
-$Id$
-
 License:
 Copyright 2008 Steven Barth <steven@midlink.org>
 
@@ -182,27 +179,18 @@ end
 -- 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.
 -- @param value        String value containing the data to escape
 -- @return             String value containing the escaped data
 function pcdata(value)
-       return value and tparser.sanitize_pcdata(tostring(value))
+       return value and tparser.pcdata(tostring(value))
 end
 
 --- Strip HTML tags from given string.
 -- @param value        String containing the HTML text
 -- @return     String with HTML tags stripped of
-function striptags(s)
-       return pcdata(tostring(s):gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " "))
+function striptags(value)
+       return value and tparser.striptags(tostring(value))
 end
 
 --- Splits given string on a defined separator sequence and return a table
@@ -356,7 +344,6 @@ function parse_units(ustr)
 end
 
 -- also register functions above in the central string class for convenience
-string.escape      = escape
 string.pcdata      = pcdata
 string.striptags   = striptags
 string.split       = split
@@ -619,6 +606,7 @@ end
 function _sortiter( t, f )
        local keys = { }
 
+       local k, v
        for k, v in pairs(t) do
                keys[#keys+1] = k
        end
@@ -630,7 +618,7 @@ function _sortiter( t, f )
        return function()
                _pos = _pos + 1
                if _pos <= #keys then
-                       return keys[_pos], t[keys[_pos]]
+                       return keys[_pos], t[keys[_pos]], _pos
                end
        end
 end