Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc 

room invitations (EJAB-490)

SVN Revision: 1136
This commit is contained in:
Badlop 2008-01-01 17:09:22 +00:00
parent ee4f623a71
commit b8993d82bd
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2008-01-01 Badlop <badlop@process-one.net> 2008-01-01 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc
room invitations (EJAB-490)
* src/ejabberdctl.template: Create logs_dir if doesn't exist. New * src/ejabberdctl.template: Create logs_dir if doesn't exist. New
parameters --config, --ctl-config, --logs, --spool. Crash dump parameters --config, --ctl-config, --logs, --spool. Crash dump
renamed to erl_crash_DATETIME.dump. renamed to erl_crash_DATETIME.dump.

9
src/mod_muc/mod_muc_room.erl
View File

@ -2975,12 +2975,19 @@ check_invitation(From, Els, Lang, StateData) ->
xml:get_path_s( xml:get_path_s(
InviteEl, InviteEl,
[{elem, "reason"}, cdata]), [{elem, "reason"}, cdata]),
ContinueEl =
case xml:get_path_s(
InviteEl,
[{elem, "continue"}]) of
[] -> [];
Continue1 -> [Continue1]
end,
IEl = IEl =
[{xmlelement, "invite", [{xmlelement, "invite",
[{"from", [{"from",
jlib:jid_to_string(From)}], jlib:jid_to_string(From)}],
[{xmlelement, "reason", [], [{xmlelement, "reason", [],
[{xmlcdata, Reason}]}]}], [{xmlcdata, Reason}]}] ++ ContinueEl}],
PasswdEl = PasswdEl =
case (StateData#state.config)#config.password_protected of case (StateData#state.config)#config.password_protected of
true -> true ->