diff options
| author | Kim Alvefur <zash@zash.se> | 2016-05-28 12:51:12 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-05-28 12:51:12 +0200 |
| commit | 0963de2358412e9c7591a1aa7f2ba5ac5aa3df76 (patch) | |
| tree | af9b1ce44f8066574de3d39858357fa64c4aa35b | |
| parent | 713422034f373d676d484d3f40fee0667416a25a (diff) | |
| parent | 609c8e58a269587412e5aa555d06bc5725a574bc (diff) | |
| download | prosody-0963de2358412e9c7591a1aa7f2ba5ac5aa3df76.tar.gz prosody-0963de2358412e9c7591a1aa7f2ba5ac5aa3df76.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/muc/muc.lib.lua | 3 | ||||
| -rw-r--r-- | util/dataforms.lua | 16 |
2 files changed, 14 insertions, 5 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index baa72a56..3ab9656c 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -872,7 +872,8 @@ function room_mt:handle_admin_query_get_command(origin, stanza) -- You need to be at least an admin, and be requesting info about your affifiliation or lower -- e.g. an admin can't ask for a list of owners local affiliation_rank = valid_affiliations[affiliation or "none"]; - if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank then + if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank + or self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member then local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); for jid in self:each_affiliation(_aff or "none") do reply:tag("item", {affiliation = _aff, jid = jid}):up(); diff --git a/util/dataforms.lua b/util/dataforms.lua index 79b4d1a4..685f3aaf 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -69,10 +69,10 @@ function form_t.form(layout, data, formtype) end elseif field_type == "list-single" then local has_default = false; - for _, val in ipairs(value) do + for _, val in ipairs(field.options or 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 + if value == val.value or field.options and val.default and (not has_default) then form:tag("value"):text(val.value):up(); has_default = true; end @@ -80,17 +80,25 @@ function form_t.form(layout, data, formtype) form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up(); end end + if field.options and value then + form:tag("value"):text(value):up(); + end elseif field_type == "list-multi" then - for _, val in ipairs(value) do + for _, val in ipairs(field.options or value) do if type(val) == "table" then form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up(); - if val.default then + if not field.options and 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 + if field.options and value then + for _, val in ipairs(value) do + form:tag("value"):text(val):up(); + end + end end end |