diff options
| author | Badlop <badlop@process-one.net> | 2008-02-11 12:15:34 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-02-11 12:15:34 +0000 |
| commit | 8104eac23a11ea4e8ebb6d9bee07eb5a2049eb41 (patch) | |
| tree | 441f7555f0b76d81b98483874092aa830229b40a /src/mod_muc/mod_muc_room.erl | |
| parent | * src/mod_muc/mod_muc_room.erl: Include the error condition in the (diff) | |
* src/mod_muc/mod_muc_room.erl: Bugfix: local message stanza may
not have an attribute From (EJAB-515)
SVN Revision: 1180
Diffstat (limited to 'src/mod_muc/mod_muc_room.erl')
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 9a36e77a..6e61180c 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -1037,7 +1037,7 @@ get_error_condition(Packet) -> case catch get_error_condition2(Packet) of {condition, ErrorCondition} -> ErrorCondition; - {'EXIT', Error} -> + {'EXIT', _} -> "badformed error stanza" end. get_error_condition2(Packet) -> @@ -3104,7 +3104,7 @@ check_invitation(From, Els, Lang, StateData) -> handle_roommessage_from_nonparticipant(Packet, Lang, StateData, From) -> case catch check_decline_invitation(Packet) of {true, Decline_data} -> - send_decline_invitation(Decline_data, StateData#state.jid); + send_decline_invitation(Decline_data, StateData#state.jid, From); _ -> send_error_only_occupants(Packet, Lang, StateData#state.jid, From) end. @@ -3114,18 +3114,18 @@ handle_roommessage_from_nonparticipant(Packet, Lang, StateData, From) -> %% This function must be catched, %% because it crashes when the packet is not a decline message. check_decline_invitation(Packet) -> - {xmlelement, "message", PAttrs, _} = Packet, + {xmlelement, "message", _, _} = Packet, XEl = xml:get_subtag(Packet, "x"), ?NS_MUC_USER = xml:get_tag_attr_s("xmlns", XEl), DEl = xml:get_subtag(XEl, "decline"), - {value, FromString} = xml:get_attr("from", PAttrs), ToString = xml:get_tag_attr_s("to", DEl), ToJID = jlib:string_to_jid(ToString), - {true, {Packet, XEl, DEl, FromString, ToJID}}. + {true, {Packet, XEl, DEl, ToJID}}. %% Send the decline to the inviter user. %% The original stanza must be slightly modified. -send_decline_invitation({Packet, XEl, DEl, FromString, ToJID}, RoomJID) -> +send_decline_invitation({Packet, XEl, DEl, ToJID}, RoomJID, FromJID) -> + FromString = jlib:jid_to_string(FromJID), {xmlelement, "decline", DAttrs, DEls} = DEl, DAttrs2 = lists:keydelete("to", 1, DAttrs), DAttrs3 = [{"from", FromString} | DAttrs2], |