mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-22 17:28:25 +01:00
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
* src/mod_roster.erl: Likewise * src/mod_roster_odbc.erl: Likewise * src/mod_shared_roster.erl: Likewise SVN Revision: 1666
This commit is contained in:
parent
cdcf2d380b
commit
426e75a298
@ -1,5 +1,10 @@
|
||||
2008-10-24 Badlop <badlop@process-one.net>
|
||||
|
||||
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
|
||||
* src/mod_roster.erl: Likewise
|
||||
* src/mod_roster_odbc.erl: Likewise
|
||||
* src/mod_shared_roster.erl: Likewise
|
||||
|
||||
* src/ejabberd_lstener.erl: Fix listeners
|
||||
* src/ejabberd_sup.erl: Likewise
|
||||
* src/gen_mod.erl: Likewise
|
||||
|
@ -1192,7 +1192,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
|
||||
NewPL ->
|
||||
PrivPushIQ =
|
||||
#iq{type = set, xmlns = ?NS_PRIVACY,
|
||||
id = "push",
|
||||
id = "push" ++ randoms:get_string(),
|
||||
sub_el = [{xmlelement, "query",
|
||||
[{"xmlns", ?NS_PRIVACY}],
|
||||
[{xmlelement, "list",
|
||||
|
@ -336,7 +336,7 @@ push_item(User, Server, From, Item) ->
|
||||
% TODO: don't push to those who didn't load roster
|
||||
push_item(User, Server, Resource, From, Item) ->
|
||||
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
|
||||
id = "push",
|
||||
id = "push" ++ randoms:get_string(),
|
||||
sub_el = [{xmlelement, "query",
|
||||
[{"xmlns", ?NS_ROSTER}],
|
||||
[item_to_xml(Item)]}]},
|
||||
|
@ -371,7 +371,7 @@ push_item(User, Server, From, Item) ->
|
||||
% TODO: don't push to those who not load roster
|
||||
push_item(User, Server, Resource, From, Item) ->
|
||||
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
|
||||
id = "push",
|
||||
id = "push" ++ randoms:get_string(),
|
||||
sub_el = [{xmlelement, "query",
|
||||
[{"xmlns", ?NS_ROSTER}],
|
||||
[item_to_xml(Item)]}]},
|
||||
|
@ -242,7 +242,7 @@ set_new_rosteritems(UserFrom, ServerFrom,
|
||||
|
||||
set_item(User, Server, Resource, Item) ->
|
||||
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
|
||||
id = "push",
|
||||
id = "push" ++ randoms:get_string(),
|
||||
sub_el = [{xmlelement, "query",
|
||||
[{"xmlns", ?NS_ROSTER}],
|
||||
[mod_roster:item_to_xml(Item)]}]},
|
||||
@ -548,7 +548,7 @@ push_item(User, Server, From, Item) ->
|
||||
Item#roster.subscription}]}),
|
||||
Stanza = jlib:iq_to_xml(
|
||||
#iq{type = set, xmlns = ?NS_ROSTER,
|
||||
id = "push",
|
||||
id = "push" ++ randoms:get_string(),
|
||||
sub_el = [{xmlelement, "query",
|
||||
[{"xmlns", ?NS_ROSTER}],
|
||||
[item_to_xml(Item)]}]}),
|
||||
|
Loading…
Reference in New Issue
Block a user