mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-14 22:00:16 +02:00
Merge branch 'master' of github.com:processone/ejabberd
This commit is contained in:
commit
b2279d481d
|
@ -824,8 +824,12 @@ get_room_options(Pid) ->
|
|||
get_options(Config).
|
||||
|
||||
get_options(Config) ->
|
||||
Fields = record_info(fields, config),
|
||||
[config | Values] = tuple_to_list(Config),
|
||||
Fields = [jlib:atom_to_binary(Field) || Field <- record_info(fields, config)],
|
||||
[config | ValuesRaw] = tuple_to_list(Config),
|
||||
Values = lists:map(fun(V) when is_atom(V) -> jlib:atom_to_binary(V);
|
||||
(V) when is_integer(V) -> jlib:integer_to_binary(V);
|
||||
(V) when is_tuple(V); is_list(V) -> list_to_binary(hd(io_lib:format("~w", [V])));
|
||||
(V) -> V end, ValuesRaw),
|
||||
lists:zip(Fields, Values).
|
||||
|
||||
%%----------------------------
|
||||
|
@ -881,12 +885,19 @@ make_opts(StateData) ->
|
|||
Config = StateData#state.config,
|
||||
[
|
||||
{title, Config#config.title},
|
||||
{vcard, Config#config.vcard},
|
||||
{voice_request_min_interval, Config#config.voice_request_min_interval},
|
||||
{allow_change_subj, Config#config.allow_change_subj},
|
||||
{allow_query_users, Config#config.allow_query_users},
|
||||
{allow_private_messages, Config#config.allow_private_messages},
|
||||
{allow_private_messages_from_visitors, Config#config.allow_private_messages_from_visitors},
|
||||
{allow_visitor_status, Config#config.allow_visitor_status},
|
||||
{allow_visitor_nickchange, Config#config.allow_visitor_nickchange},
|
||||
{allow_voice_requests, Config#config.allow_voice_requests},
|
||||
{public, Config#config.public},
|
||||
{public_list, Config#config.public_list},
|
||||
{persistent, Config#config.persistent},
|
||||
{mam, Config#config.mam},
|
||||
{moderated, Config#config.moderated},
|
||||
{members_by_default, Config#config.members_by_default},
|
||||
{members_only, Config#config.members_only},
|
||||
|
@ -894,6 +905,8 @@ make_opts(StateData) ->
|
|||
{password_protected, Config#config.password_protected},
|
||||
{password, Config#config.password},
|
||||
{anonymous, Config#config.anonymous},
|
||||
{captcha_protected, Config#config.captcha_protected},
|
||||
{description, Config#config.description},
|
||||
{logging, Config#config.logging},
|
||||
{max_users, Config#config.max_users},
|
||||
{affiliations, ?DICT:to_list(StateData#state.affiliations)},
|
||||
|
|
Loading…
Reference in New Issue
Block a user