util.filters: Fix inserting items so that higher priority filters run first

[prosody.git] / util / dataforms.lua

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 8cb3914418bf1d1cbe720ea0edb0ff6ee57f4da1..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
-                               
+                               form:tag("value"):text(value):up();
                        elseif field_type == "jid-multi" then
                                for _, jid in ipairs(value) do
                                        form:tag("value"):text(jid):up();
@@ -185,9 +185,13 @@ field_readers["list-multi"] =
        function (field_tag, required)
                local result = {};
                for value in field_tag:childtags("value") do
-                       result[#result+1] = value;
+                       result[#result+1] = value:get_text();
+               end
+               if #result > 0 then
+                       return result;
+               elseif required then
+                       return nil, "Required value missing";
                end
-               return result, (required and #result == 0 and "Required value missing" or nil);
        end
 
 field_readers["text-multi"] =
@@ -202,10 +206,10 @@ field_readers["text-multi"] =
 field_readers["list-single"] =
        field_readers["text-single"];
 
-       local boolean_values = {
-               ["1"] = true, ["true"] = true,
-               ["0"] = false, ["false"] = false,
-       };
+local boolean_values = {
+       ["1"] = true, ["true"] = true,
+       ["0"] = false, ["false"] = false,
+};
 
 field_readers["boolean"] =
        function (field_tag, required)