projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_s2s: Log certificate identity validation result
[prosody.git]
/
util
/
dataforms.lua
diff --git
a/util/dataforms.lua
b/util/dataforms.lua
index 55bad998faea6569b44f51b91d06800edb2d540e..52924841a0dc4fcc98907ed2eb96f9891c1cdbfe 100644
(file)
--- a/
util/dataforms.lua
+++ b/
util/dataforms.lua
@@
-53,7
+53,7
@@
function form_t.form(layout, data, formtype)
elseif field_type == "boolean" then
form:tag("value"):text((value and "1") or "0"):up();
elseif field_type == "fixed" then
elseif field_type == "boolean" then
form:tag("value"):text((value and "1") or "0"):up();
elseif field_type == "fixed" then
-
+ form:tag("value"):text(value):up();
elseif field_type == "jid-multi" then
for _, jid in ipairs(value) do
form:tag("value"):text(jid):up();
elseif field_type == "jid-multi" then
for _, jid in ipairs(value) do
form:tag("value"):text(jid):up();
@@
-187,7
+187,11
@@
field_readers["list-multi"] =
for value in field_tag:childtags("value") do
result[#result+1] = value:get_text();
end
for value in field_tag:childtags("value") do
result[#result+1] = value:get_text();
end
- return result, (required and #result == 0 and "Required value missing" or nil);
+ if #result > 0 then
+ return result;
+ elseif required then
+ return nil, "Required value missing";
+ end
end
field_readers["text-multi"] =
end
field_readers["text-multi"] =