mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-24 16:23:40 +01:00
Pubsub subscription is now wrapped in pubsub tags (EJAB-580)
SVN Revision: 1244
This commit is contained in:
parent
618af5e07a
commit
1247a98cf2
@ -6,6 +6,9 @@
|
|||||||
* src/ejabberdctl.template: Likewise
|
* src/ejabberdctl.template: Likewise
|
||||||
* tools/ejabberdctl: Likewise
|
* tools/ejabberdctl: Likewise
|
||||||
|
|
||||||
|
* src/mod_pubsub/mod_pubsub.erl: Pubsub subscription is now wrapped in
|
||||||
|
pubsub tags (EJAB-580)
|
||||||
|
|
||||||
2008-03-21 Badlop <badlop@process-one.net>
|
2008-03-21 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
* src/cyrsasl_digest.erl: Rewrite io:format calls to loglevel
|
* src/cyrsasl_digest.erl: Rewrite io:format calls to loglevel
|
||||||
|
@ -1355,13 +1355,12 @@ subscribe_node(Host, Node, From, JID) ->
|
|||||||
[{"node", node_to_string(Node)},
|
[{"node", node_to_string(Node)},
|
||||||
{"jid", jlib:jid_to_string(Subscriber)},
|
{"jid", jlib:jid_to_string(Subscriber)},
|
||||||
{"subscription", subscription_to_string(Subscription)}],
|
{"subscription", subscription_to_string(Subscription)}],
|
||||||
case Subscription of
|
[{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}],
|
||||||
subscribed ->
|
[{xmlelement, "subscription",
|
||||||
[{xmlelement, "subscription",
|
case Subscription of
|
||||||
Fields ++ [{"subid", SubId}], []}];
|
subscribed -> [{"subid", SubId}|Fields];
|
||||||
_ ->
|
_ -> Fields
|
||||||
[{xmlelement, "subscription", Fields, []}]
|
end, []}]}]
|
||||||
end
|
|
||||||
end,
|
end,
|
||||||
case transaction(Host, Node, Action, sync_dirty) of
|
case transaction(Host, Node, Action, sync_dirty) of
|
||||||
{error, Error} ->
|
{error, Error} ->
|
||||||
|
Loading…
Reference in New Issue
Block a user