mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Waqas Hussain 2014-10-08 18:42:33 -04:00
commit cff8575563
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/dataforms.lua
View file

@ -121,7 +121,7 @@ function form_t.data(layout, stanza)
for _, field in ipairs(layout) do
local tag;
for field_tag in stanza:childtags() do
for field_tag in stanza:childtags("field") do
if field.name == field_tag.attr.var then
tag = field_tag;
break;

15
util/stanza.lua
View file

@ -202,8 +202,19 @@ end
local xml_escape
do
local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
local escape_table = {
["'"] = "&apos;";
['"'] = "&quot;";
["<"] = "&lt;";
[">"] = "&gt;";
["&"] = "&amp;";
-- escape this whitespace because [\r\n\t] change into spaces in attributes
-- and \r\n changes into \n in text, and we want to preserve original bytes
["\t"] = "&#x9;";
["\n"] = "&#xA;";
["\r"] = "&#xD;";
};
function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end
_M.xml_escape = xml_escape;
end