mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-31 15:21:38 +01:00
Allow node creation without configure item
SVN Revision: 1962
This commit is contained in:
parent
abbfa96fc4
commit
e4db030f4e
@ -1,3 +1,8 @@
|
|||||||
|
2009-03-04 Christophe Romain <christophe.romain@process-one.net>
|
||||||
|
|
||||||
|
* src/mod_pubsub/mod_pubsub.erl: Allow node creation without configure
|
||||||
|
item
|
||||||
|
|
||||||
2009-03-03 Christophe Romain <christophe.romain@process-one.net>
|
2009-03-03 Christophe Romain <christophe.romain@process-one.net>
|
||||||
|
|
||||||
* src/mod_pubsub/mod_pubsub.erl: Add roster subscriptions handling
|
* src/mod_pubsub/mod_pubsub.erl: Add roster subscriptions handling
|
||||||
|
@ -920,8 +920,10 @@ iq_pubsub(Host, ServerHost, From, IQType, SubEl, _Lang, Access, Plugins) ->
|
|||||||
end,
|
end,
|
||||||
case {IQType, Name} of
|
case {IQType, Name} of
|
||||||
{set, "create"} ->
|
{set, "create"} ->
|
||||||
case Configuration of
|
Config = case Configuration of
|
||||||
[{xmlelement, "configure", _, Config}] ->
|
[{xmlelement, "configure", _, C}] -> C;
|
||||||
|
_ -> []
|
||||||
|
end,
|
||||||
%% Get the type of the node
|
%% Get the type of the node
|
||||||
Type = case xml:get_attr_s("type", Attrs) of
|
Type = case xml:get_attr_s("type", Attrs) of
|
||||||
[] -> hd(Plugins);
|
[] -> hd(Plugins);
|
||||||
@ -938,13 +940,6 @@ iq_pubsub(Host, ServerHost, From, IQType, SubEl, _Lang, Access, Plugins) ->
|
|||||||
create_node(Host, ServerHost, Node, From,
|
create_node(Host, ServerHost, Node, From,
|
||||||
Type, Access, Config)
|
Type, Access, Config)
|
||||||
end;
|
end;
|
||||||
_ ->
|
|
||||||
%% this breaks backward compatibility!
|
|
||||||
%% can not create node without <configure/>
|
|
||||||
%% but this is the new spec anyway
|
|
||||||
?INFO_MSG("Node ~p ; invalid configuration: ~p", [Node, Configuration]),
|
|
||||||
{error, ?ERR_BAD_REQUEST}
|
|
||||||
end;
|
|
||||||
{set, "publish"} ->
|
{set, "publish"} ->
|
||||||
case xml:remove_cdata(Els) of
|
case xml:remove_cdata(Els) of
|
||||||
[{xmlelement, "item", ItemAttrs, Payload}] ->
|
[{xmlelement, "item", ItemAttrs, Payload}] ->
|
||||||
|
Loading…
Reference in New Issue
Block a user