diff options
| author | Badlop <badlop@process-one.net> | 2007-12-23 12:28:44 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2007-12-23 12:28:44 +0000 |
| commit | afdc9b9527eb409da2b7cef45b8d45ddf15d80b2 (patch) | |
| tree | 0fb4beadd72e83114fc7ebd0427f4c64dbdf697f /src | |
| parent | * src/ejabberd.app: Update ejabberd.app: add new erlang (diff) | |
* src/mod_muc/mod_muc_room.erl: Log room creation and
destruction. Ensure JID of owners of MUC room are user, not
server (EJAB-435)
SVN Revision: 1104
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 282b212ee..ae4c2b912 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -159,6 +159,8 @@ init([Host, ServerHost, Access, Room, HistorySize, RoomShaper, Creator, _Nick, D just_created = true, room_shaper = Shaper}), State1 = set_opts(DefRoomOpts, State), + ?INFO_MSG("Created MUC room ~s@~s by ~s", + [Room, Host, jlib:jid_to_string(Creator)]), {ok, normal_state, State1}; init([Host, ServerHost, Access, Room, HistorySize, RoomShaper, Opts]) -> Shaper = shaper:new(RoomShaper), @@ -1930,13 +1932,18 @@ process_admin_items_set(UJID, Items, Lang, StateData) -> URole = get_role(UJID, StateData), case find_changed_items(UJID, UAffiliation, URole, Items, Lang, StateData, []) of {result, Res} -> - ?INFO_MSG("Processing MUC admin query from ~s:~n ~p~n", - [jlib:jid_to_string(UJID), Res]), + ?INFO_MSG("Processing MUC admin query from ~s in room ~s:~n ~p", + [jlib:jid_to_string(UJID), jlib:jid_to_string(StateData#state.jid), Res]), NSD = lists:foldl( fun(E, SD) -> case catch ( case E of + {JID, affiliation, owner, _} + when (JID#jid.luser == "") -> + %% If the provided JID does not have username, + %% forget the affiliation completely + SD; {JID, role, none, Reason} -> catch send_kickban_presence( JID, Reason, "307", SD), @@ -2388,6 +2395,8 @@ process_iq_owner(From, set, Lang, SubEl, StateData) -> {error, ?ERR_BAD_REQUEST} end; [{xmlelement, "destroy", _Attrs1, _Els1} = SubEl1] -> + ?INFO_MSG("Destroyed MUC room ~s by ~s", + [jlib:jid_to_string(StateData#state.jid), jlib:jid_to_string(From)]), destroy_room(SubEl1, StateData); Items -> process_admin_items_set(From, Items, Lang, StateData) |