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

* src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a

Browse Source 
private message with type=error (EJAB-496)

SVN Revision: 1142
This commit is contained in:
Badlop 2008-01-09 16:01:16 +00:00
parent bceea5fc73
commit 5868a9d1a5
2 changed files with 49 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-01-09 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a
private message with type=error (EJAB-496)
2008-01-08 Badlop <badlop@process-one.net> 2008-01-08 Badlop <badlop@process-one.net>
* src/ejabberdctl.template: Removed the option ERL_FULLSWEEP_AFTER * src/ejabberdctl.template: Removed the option ERL_FULLSWEEP_AFTER

20
src/mod_muc/mod_muc_room.erl
View File

@ -469,23 +469,6 @@ normal_state({route, From, ToNick,
StateData) -> StateData) ->
Type = xml:get_attr_s("type", Attrs), Type = xml:get_attr_s("type", Attrs),
Lang = xml:get_attr_s("xml:lang", Attrs), Lang = xml:get_attr_s("xml:lang", Attrs),
case Type of
"error" ->
case is_user_online(From, StateData) of
true ->
NewState =
add_user_presence_un(
From,
{xmlelement, "presence",
[{"type", "unavailable"}], []},
StateData),
send_new_presence(From, NewState),
{next_state, normal_state,
remove_online_user(From, NewState)};
_ ->
{next_state, normal_state, StateData}
end;
_ ->
case (StateData#state.config)#config.allow_private_messages case (StateData#state.config)#config.allow_private_messages
andalso is_user_online(From, StateData) of andalso is_user_online(From, StateData) of
true -> true ->
@ -532,8 +515,7 @@ normal_state({route, From, ToNick,
ToNick), ToNick),
From, Err) From, Err)
end, end,
{next_state, normal_state, StateData} {next_state, normal_state, StateData};
end;
normal_state({route, From, ToNick, normal_state({route, From, ToNick,
{xmlelement, "iq", Attrs, _Els} = Packet}, {xmlelement, "iq", Attrs, _Els} = Packet},