util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / dataforms.lua

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 1619ddc58f391091fd3c1faccc81ccfc40c27512..ae745e03ed334d08c4ef9d284ce900b69527943f 100644 (file)
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -10,7 +10,6 @@ local setmetatable = setmetatable;
 local pairs, ipairs = pairs, ipairs;
 local tostring, type = tostring, type;
 local t_concat = table.concat;
-
 local st = require "util.stanza";
 
 module "dataforms"
@@ -24,8 +23,8 @@ function new(layout)
        return setmetatable(layout, form_mt);
 end
 
-function form_t.form(layout, data)
-       local form = st.stanza("x", { xmlns = xmlns_forms, type = "form" });
+function form_t.form(layout, data, formtype)
+       local form = st.stanza("x", { xmlns = xmlns_forms, type = formtype or "form" });
        if layout.title then
                form:tag("title"):text(layout.title):up();
        end
@@ -37,34 +36,60 @@ function form_t.form(layout, data)
                -- Add field tag
                form:tag("field", { type = field_type, var = field.name, label = field.label });
 
-               local value = data[field.name] or field.value;
+               local value = (data and data[field.name]) or field.value;
                
-               -- Add value, depending on type
-               if field_type == "hidden" then
-                       if type(value) == "table" then
-                               -- Assume an XML snippet
-                               form:tag("value")
-                                       :add_child(value)
-                                       :up();
-                       elseif value then
-                               form:tag("value"):text(tostring(value)):up();
-                       end
-               elseif field_type == "boolean" then
-                       form:tag("value"):text((value and "1") or "0"):up();
-               elseif field_type == "fixed" then
-                       
-               elseif field_type == "jid-multi" then
-                       for _, jid in ipairs(value) do
-                               form:tag("value"):text(jid):up();
-                       end
-               elseif field_type == "jid-single" then
-                       form:tag("value"):text(value):up();
-               elseif field_type == "text-single" or field_type == "text-private" then
-                       form:tag("value"):text(value):up();
-               elseif field_type == "text-multi" then
-                       -- Split into multiple <value> tags, one for each line
-                       for line in value:gmatch("([^\r\n]+)\r?\n*") do
-                               form:tag("value"):text(line):up();
+               if value then
+                       -- Add value, depending on type
+                       if field_type == "hidden" then
+                               if type(value) == "table" then
+                                       -- Assume an XML snippet
+                                       form:tag("value")
+                                               :add_child(value)
+                                               :up();
+                               else
+                                       form:tag("value"):text(tostring(value)):up();
+                               end
+                       elseif field_type == "boolean" then
+                               form:tag("value"):text((value and "1") or "0"):up();
+                       elseif field_type == "fixed" then
+                               
+                       elseif field_type == "jid-multi" then
+                               for _, jid in ipairs(value) do
+                                       form:tag("value"):text(jid):up();
+                               end
+                       elseif field_type == "jid-single" then
+                               form:tag("value"):text(value):up();
+                       elseif field_type == "text-single" or field_type == "text-private" then
+                               form:tag("value"):text(value):up();
+                       elseif field_type == "text-multi" then
+                               -- Split into multiple <value> tags, one for each line
+                               for line in value:gmatch("([^\r\n]+)\r?\n*") do
+                                       form:tag("value"):text(line):up();
+                               end
+                       elseif field_type == "list-single" then
+                               local has_default = false;
+                               for _, val in ipairs(value) do
+                                       if type(val) == "table" then
+                                               form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
+                                               if val.default and (not has_default) then
+                                                       form:tag("value"):text(val.value):up();
+                                                       has_default = true;
+                                               end
+                                       else
+                                               form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up();
+                                       end
+                               end
+                       elseif field_type == "list-multi" then
+                               for _, val in ipairs(value) do
+                                       if type(val) == "table" then
+                                               form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
+                                               if val.default then
+                                                       form:tag("value"):text(val.value):up();
+                                               end
+                                       else
+                                               form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up();
+                                       end
+                               end
                        end
                end
                
@@ -84,7 +109,13 @@ function form_t.data(layout, stanza)
        local data = {};
        
        for field_tag in stanza:childtags() do
-               local field_type = field_tag.attr.type;
+               local field_type;
+               for n, field in ipairs(layout) do
+                       if field.name == field_tag.attr.var then
+                               field_type = field.type;
+                               break;
+                       end
+               end
                
                local reader = field_readers[field_type];
                if reader then
@@ -95,7 +126,7 @@ function form_t.data(layout, stanza)
        return data;
 end
 
-field_readers["text-single"] = 
+field_readers["text-single"] =
        function (field_tag)
                local value = field_tag:child_with_name("value");
                if value then
@@ -103,13 +134,24 @@ field_readers["text-single"] =
                end
        end
 
-field_readers["text-private"] = 
+field_readers["text-private"] =
        field_readers["text-single"];
 
 field_readers["jid-single"] =
        field_readers["text-single"];
 
-field_readers["text-multi"] = 
+field_readers["jid-multi"] =
+       function (field_tag)
+               local result = {};
+               for value_tag in field_tag:childtags() do
+                       if value_tag.name == "value" then
+                               result[#result+1] = value_tag[1];
+                       end
+               end
+               return result;
+       end
+
+field_readers["text-multi"] =
        function (field_tag)
                local result = {};
                for value_tag in field_tag:childtags() do
@@ -120,7 +162,21 @@ field_readers["text-multi"] =
                return t_concat(result, "\n");
        end
 
-field_readers["boolean"] = 
+field_readers["list-single"] =
+       field_readers["text-single"];
+
+field_readers["list-multi"] =
+       function (field_tag)
+               local result = {};
+               for value_tag in field_tag:childtags() do
+                       if value_tag.name == "value" then
+                               result[#result+1] = value_tag[1];
+                       end
+               end
+               return result;
+       end
+
+field_readers["boolean"] =
        function (field_tag)
                local value = field_tag:child_with_name("value");
                if value then
@@ -129,10 +185,10 @@ field_readers["boolean"] =
                        else
                                return false;
                        end
-               end             
+               end
        end
 
-field_readers["hidden"] = 
+field_readers["hidden"] =
        function (field_tag)
                local value = field_tag:child_with_name("value");
                if value then