Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Use proper module name

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2012-03-31 22:56:51 +10:00
parent 6b3875814c
commit 6ec5c7c4d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod_muc/mod_muc.erl
View File

@ -513,7 +513,7 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper,
check_user_can_create_room(ServerHost, AccessCreate, From, RoomID) -> check_user_can_create_room(ServerHost, AccessCreate, From, RoomID) ->
case acl:match_rule(ServerHost, AccessCreate, From) of case acl:match_rule(ServerHost, AccessCreate, From) of
allow -> allow ->
(length(RoomID) =< gen_mod:get_module_opt(ServerHost, mod_muc, (length(RoomID) =< gen_mod:get_module_opt(ServerHost, ?MODULE,
max_room_id, infinite)); max_room_id, infinite));
_ -> _ ->
false false

6
src/mod_muc/mod_muc_odbc.erl
View File

@ -96,8 +96,8 @@ stop(Host) ->
%% This function is called by a room in three situations: %% This function is called by a room in three situations:
%% A) The owner of the room destroyed it %% A) The owner of the room destroyed it
%% B) The only participant of a temporary room leaves it %% B) The only participant of a temporary room leaves it
%% C) mod_muc:stop was called, and each room is being terminated %% C) mod_muc_odbc:stop was called, and each room is being terminated
%% In this case, the mod_muc process died before the room processes %% In this case, the mod_muc_odbc process died before the room processes
%% So the message sending must be catched %% So the message sending must be catched
room_destroyed(Host, Room, Pid, ServerHost) -> room_destroyed(Host, Room, Pid, ServerHost) ->
catch gen_mod:get_module_proc(ServerHost, ?PROCNAME) ! catch gen_mod:get_module_proc(ServerHost, ?PROCNAME) !
@ -521,7 +521,7 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper,
check_user_can_create_room(ServerHost, AccessCreate, From, RoomID) -> check_user_can_create_room(ServerHost, AccessCreate, From, RoomID) ->
case acl:match_rule(ServerHost, AccessCreate, From) of case acl:match_rule(ServerHost, AccessCreate, From) of
allow -> allow ->
(length(RoomID) =< gen_mod:get_module_opt(ServerHost, mod_muc, (length(RoomID) =< gen_mod:get_module_opt(ServerHost, ?MODULE,
max_room_id, infinite)); max_room_id, infinite));
_ -> _ ->
false false