mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[prosody.git] / util / dataforms.lua

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 85bb39c146f959d4b6ff81fca46a27c597c97dd3..8634e337f98ee1db5b43470581764755a4c9e12c 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();
@@ -156,7 +156,7 @@ field_readers["jid-single"] =
                if data and #data > 0 then
                        return data
                elseif raw_data then
-                       return raw_data, "Invalid JID";
+                       return nil, "Invalid JID: " .. raw_data;
                elseif required then
                        return nil, "Required value missing";
                end
@@ -185,7 +185,7 @@ 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
                return result, (required and #result == 0 and "Required value missing" or nil);
        end
@@ -202,10 +202,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)
@@ -214,7 +214,7 @@ field_readers["boolean"] =
                if value ~= nil then
                        return value;
                elseif raw_value then
-                       return "Invalid boolean representation";
+                       return nil, "Invalid boolean representation";
                elseif required then
                        return nil, "Required value missing";
                end