Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

More correct dispatching of normal messages to conference room

Browse Source 
is_invitation/1 function returns true if <x> element of message is
an invitation
This commit is contained in:
Maxim Ignatenko 2011-07-23 12:16:17 +03:00
parent c4f9a050c9
commit 2a41ca0628
1 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mod_muc/mod_muc_room.erl
View File

@ -256,6 +256,9 @@ normal_state({route, From, "",
From, Err),
{next_state, normal_state, StateData};
Type when (Type == "") or (Type == "normal") ->
IsInvitation = is_invitation(Els),
if
IsInvitation ->
case catch check_invitation(From, Els, Lang, StateData) of
{error, Error} ->
Err = jlib:make_error_reply(
@ -292,6 +295,9 @@ normal_state({route, From, "",
{next_state, normal_state, StateData}
end
end;
true ->
{next_state, normal_state, StateData}
end;
_ ->
ErrText = "Improper message type",
Err = jlib:make_error_reply(
@ -3623,6 +3629,24 @@ get_mucroom_disco_items(StateData) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Invitation support
is_invitation(Els) ->
case xml:remove_cdata(Els) of
[{xmlelement, "x", _Attrs1, Els1} = XEl] ->
case xml:get_tag_attr_s("xmlns", XEl) of
?NS_MUC_USER ->
case xml:remove_cdata(Els1) of
[{xmlelement, "invite", _, _}] ->
true;
_ ->
false
end;
_ ->
false
end;
_ ->
false
end.
check_invitation(From, Els, Lang, StateData) ->
FAffiliation = get_affiliation(From, StateData),
CanInvite = (StateData#state.config)#config.allow_user_invites