Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Send authorization messages outside of get-pending transaction (thanks to Brian Cully)(EJAB-1090)

Browse Source 
SVN Revision: 2720
This commit is contained in:
Badlop 2009-11-04 17:40:39 +00:00
parent 1c2d639179
commit ae93cf2c28
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mod_pubsub/mod_pubsub.erl
View File

@ -1458,17 +1458,7 @@ send_pending_auth_events(Host, Node, Owner) ->
true -> true ->
case node_call(Type, get_affiliation, [NodeID, Owner]) of case node_call(Type, get_affiliation, [NodeID, Owner]) of
{result, owner} -> {result, owner} ->
{result, Subscriptions} = node_call(Type, get_node_subscriptions, [NodeID]), node_call(Type, get_node_subscriptions, [NodeID]);
lists:foreach(fun({J, pending, _SubID}) ->
{U, S, R} = J,
send_authorization_request(Node, exmpp_jid:make(U,S,R));
({J, pending}) ->
{U, S, R} = J,
send_authorization_request(Node, exmpp_jid:make(U,S,R));
(_) ->
ok
end, Subscriptions),
{result, ok};
_ -> _ ->
{error, exmpp_stanza:error(?NS_JABBER_CLIENT, 'forbidden')} {error, exmpp_stanza:error(?NS_JABBER_CLIENT, 'forbidden')}
end; end;
@ -1477,7 +1467,16 @@ send_pending_auth_events(Host, Node, Owner) ->
end end
end, end,
case transaction(Host, Node, Action, sync_dirty) of case transaction(Host, Node, Action, sync_dirty) of
{result, _} -> {result, {N, Subscriptions}} ->
lists:foreach(fun({J, pending, _SubID}) ->
{U, S, R} = J,
send_authorization_request(N, exmpp_jid:make(U,S,R));
({J, pending}) ->
{U, S, R} = J,
send_authorization_request(N, exmpp_jid:make(U,S,R));
(_) ->
ok
end, Subscriptions),
#adhoc_response{}; #adhoc_response{};
Err -> Err ->
Err Err