diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/dataforms.lua | 6 | ||||
| -rw-r--r-- | util/pubsub.lua | 19 |
2 files changed, 21 insertions, 4 deletions
diff --git a/util/dataforms.lua b/util/dataforms.lua index a75e8db0..a5733b83 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -142,7 +142,7 @@ end local field_readers = {}; -function form_t.data(layout, stanza) +function form_t.data(layout, stanza, current) local data = {}; local errors = {}; local present = {}; @@ -157,7 +157,9 @@ function form_t.data(layout, stanza) end if not tag then - if field.required then + if current and current[field.name] ~= nil then + data[field.name] = current[field.name]; + elseif field.required then errors[field.name] = "Required value missing"; end elseif field.name then diff --git a/util/pubsub.lua b/util/pubsub.lua index 381c449a..f9255a55 100644 --- a/util/pubsub.lua +++ b/util/pubsub.lua @@ -17,6 +17,7 @@ local default_node_config = { ["persist_items"] = false; ["max_items"] = 20; ["access_model"] = "open"; + ["publish_model"] = "publishers"; }; local default_node_config_mt = { __index = default_node_config }; @@ -365,7 +366,19 @@ end function service:publish(node, actor, id, item) -- Access checking - if not self:may(node, actor, "publish") then + local may_publish = false; + + if self:may(node, actor, "publish") then + may_publish = true; + else + local node_obj = self.nodes[node]; + local publish_model = node_obj and node_obj.config.publish_model; + if publish_model == "open" + or (publish_model == "subscribers" and node_obj.subscribers[actor]) then + may_publish = true; + end + end + if not may_publish then return false, "forbidden"; end -- @@ -565,6 +578,8 @@ function service:set_node_config(node, actor, new_config) return false, "item-not-found"; end + setmetatable(new_config, {__index=self.node_defaults}) + if self.config.check_node_config then local ok = self.config.check_node_config(node, actor, new_config); if not ok then @@ -573,7 +588,7 @@ function service:set_node_config(node, actor, new_config) end local old_config = node_obj.config; - node_obj.config = setmetatable(new_config, {__index=self.node_defaults}); + node_obj.config = new_config; if self.config.nodestore then local ok, err = save_node_to_store(self, node_obj); |