25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

* src/mod_roster.erl: The "id" attribute of roster push packet was

missed (thanks to Maxim Ryazanov)
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 442
This commit is contained in:
Alexey Shchepin 2005-11-22 18:43:06 +00:00
parent 3fdf05a507
commit 816d5474f8
3 changed files with 9 additions and 1 deletions

View File

@ -1,5 +1,9 @@
2005-11-22 Alexey Shchepin <alexey@sevcom.net> 2005-11-22 Alexey Shchepin <alexey@sevcom.net>
* src/mod_roster.erl: The "id" attribute of roster push packet was
missed (thanks to Maxim Ryazanov)
* src/mod_roster_odbc.erl: Likewise
* src/web/ejabberd_web_admin.erl: Fixed encoding of user names in * src/web/ejabberd_web_admin.erl: Fixed encoding of user names in
URLs URLs

View File

@ -313,11 +313,12 @@ push_item(User, Server, From, Item) ->
push_item(User, Server, Resource, From, Item) push_item(User, Server, Resource, From, Item)
end, ejabberd_sm:get_user_resources(User, Server)). end, ejabberd_sm:get_user_resources(User, Server)).
% TODO: don't push to those who not load roster % TODO: don't push to those who didn't load roster
-ifdef(PSI_ROSTER_WORKAROUND). -ifdef(PSI_ROSTER_WORKAROUND).
push_item(User, Server, Resource, _From, Item) -> push_item(User, Server, Resource, _From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push",
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}, [item_to_xml(Item)]}]},
@ -330,6 +331,7 @@ push_item(User, Server, Resource, _From, Item) ->
push_item(User, Server, Resource, From, Item) -> push_item(User, Server, Resource, From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push",
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}, [item_to_xml(Item)]}]},

View File

@ -385,6 +385,7 @@ push_item(User, Server, From, Item) ->
push_item(User, Server, Resource, _From, Item) -> push_item(User, Server, Resource, _From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push",
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}, [item_to_xml(Item)]}]},
@ -397,6 +398,7 @@ push_item(User, Server, Resource, _From, Item) ->
push_item(User, Resource, From, Item) -> push_item(User, Resource, From, Item) ->
ResIQ = #iq{type = set, xmlns = ?NS_ROSTER, ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
id = "push",
sub_el = [{xmlelement, "query", sub_el = [{xmlelement, "query",
[{"xmlns", ?NS_ROSTER}], [{"xmlns", ?NS_ROSTER}],
[item_to_xml(Item)]}]}, [item_to_xml(Item)]}]},