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

Rename option to regexp_room_id for consistency with other options (#905)

Browse Source
This commit is contained in:
Badlop 2016-02-05 12:08:40 +01:00
parent 268f0b30ec
commit 7435ee464f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod_muc.erl
View File

@ -640,7 +640,7 @@ check_create_roomid(ServerHost, RoomID) ->
fun(infinity) -> infinity; fun(infinity) -> infinity;
(I) when is_integer(I), I>0 -> I (I) when is_integer(I), I>0 -> I
end, infinity), end, infinity),
Regexp = gen_mod:get_module_opt(ServerHost, ?MODULE, room_id_regexp, Regexp = gen_mod:get_module_opt(ServerHost, ?MODULE, regexp_room_id,
fun iolist_to_binary/1, ""), fun iolist_to_binary/1, ""),
(byte_size(RoomID) =< Max) and (byte_size(RoomID) =< Max) and
(re:run(RoomID, Regexp, [unicode, {capture, none}]) == match). (re:run(RoomID, Regexp, [unicode, {capture, none}]) == match).
@ -1323,7 +1323,7 @@ mod_opt_type(max_room_id) ->
fun (infinity) -> infinity; fun (infinity) -> infinity;
(I) when is_integer(I), I > 0 -> I (I) when is_integer(I), I > 0 -> I
end; end;
mod_opt_type(room_id_regexp) -> mod_opt_type(regexp_room_id) ->
fun iolist_to_binary/1; fun iolist_to_binary/1;
mod_opt_type(max_room_name) -> mod_opt_type(max_room_name) ->
fun (infinity) -> infinity; fun (infinity) -> infinity;
@ -1350,7 +1350,7 @@ mod_opt_type(user_presence_shaper) ->
mod_opt_type(_) -> mod_opt_type(_) ->
[access, access_admin, access_create, access_persistent, [access, access_admin, access_create, access_persistent,
db_type, default_room_options, history_size, host, db_type, default_room_options, history_size, host,
max_room_desc, max_room_id, max_room_name, room_id_regexp, max_room_desc, max_room_id, max_room_name, regexp_room_id,
max_user_conferences, max_users, max_user_conferences, max_users,
max_users_admin_threshold, max_users_presence, max_users_admin_threshold, max_users_presence,
min_message_interval, min_presence_interval, min_message_interval, min_presence_interval,