aboutsummaryrefslogtreecommitdiff
path: root/src/mod_muc_admin.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mod_muc_admin.erl')
-rw-r--r--src/mod_muc_admin.erl60
1 files changed, 26 insertions, 34 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 1a6d8a865..371b5e415 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -11,24 +11,16 @@
-behaviour(gen_mod).
--export([
- start/2, stop/1, % gen_mod API
- muc_online_rooms/1,
- muc_unregister_nick/1,
- create_room/3, destroy_room/3,
+-export([start/2, stop/1, muc_online_rooms/1,
+ muc_unregister_nick/1, create_room/3, destroy_room/3,
create_rooms_file/1, destroy_rooms_file/1,
rooms_unused_list/2, rooms_unused_destroy/2,
- get_user_rooms/2,
- get_room_occupants/2,
- get_room_occupants_number/2,
- send_direct_invitation/4,
- change_room_option/4,
- get_room_options/2,
- set_room_affiliation/4,
- get_room_affiliations/2,
- web_menu_main/2, web_page_main/2, % Web Admin API
- web_menu_host/3, web_page_host/3
- ]).
+ get_user_rooms/2, get_room_occupants/2,
+ get_room_occupants_number/2, send_direct_invitation/4,
+ change_room_option/4, get_room_options/2,
+ set_room_affiliation/4, get_room_affiliations/2,
+ web_menu_main/2, web_page_main/2, web_menu_host/3,
+ web_page_host/3, mod_opt_type/1]).
-include("ejabberd.hrl").
-include("logger.hrl").
@@ -876,27 +868,25 @@ set_room_affiliation(Name, Service, JID, AffiliationString) ->
error
end.
--define(MAKE_CONFIG_OPT(Opt), {Opt, Config#config.Opt}).
-
make_opts(StateData) ->
Config = StateData#state.config,
[
- ?MAKE_CONFIG_OPT(title),
- ?MAKE_CONFIG_OPT(allow_change_subj),
- ?MAKE_CONFIG_OPT(allow_query_users),
- ?MAKE_CONFIG_OPT(allow_private_messages),
- ?MAKE_CONFIG_OPT(public),
- ?MAKE_CONFIG_OPT(public_list),
- ?MAKE_CONFIG_OPT(persistent),
- ?MAKE_CONFIG_OPT(moderated),
- ?MAKE_CONFIG_OPT(members_by_default),
- ?MAKE_CONFIG_OPT(members_only),
- ?MAKE_CONFIG_OPT(allow_user_invites),
- ?MAKE_CONFIG_OPT(password_protected),
- ?MAKE_CONFIG_OPT(password),
- ?MAKE_CONFIG_OPT(anonymous),
- ?MAKE_CONFIG_OPT(logging),
- ?MAKE_CONFIG_OPT(max_users),
+ {title, Config#config.title},
+ {allow_change_subj, Config#config.allow_change_subj},
+ {allow_query_users, Config#config.allow_query_users},
+ {allow_private_messages, Config#config.allow_private_messages},
+ {public, Config#config.public},
+ {public_list, Config#config.public_list},
+ {persistent, Config#config.persistent},
+ {moderated, Config#config.moderated},
+ {members_by_default, Config#config.members_by_default},
+ {members_only, Config#config.members_only},
+ {allow_user_invites, Config#config.allow_user_invites},
+ {password_protected, Config#config.password_protected},
+ {password, Config#config.password},
+ {anonymous, Config#config.anonymous},
+ {logging, Config#config.logging},
+ {max_users, Config#config.max_users},
{affiliations, ?DICT:to_list(StateData#state.affiliations)},
{subject, StateData#state.subject},
{subject_author, StateData#state.subject_author}
@@ -920,3 +910,5 @@ find_host(ServerHost) when is_list(ServerHost) ->
find_host(list_to_binary(ServerHost));
find_host(ServerHost) ->
gen_mod:get_module_opt_host(ServerHost, mod_muc, <<"conference.@HOST@">>).
+
+mod_opt_type(_) -> [].