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

Don't render CAPTCHA whitelist when CAPTCHA is not configured

Browse Source 
Fixes #2970
This commit is contained in:
Evgeny Khramtsov 2019-07-31 12:35:06 +03:00
parent a2fa52a192
commit 48bed43902
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_muc_room.erl
View File

@ -3527,11 +3527,15 @@ get_config(Lang, StateData, From) ->
{pubsub, Config#config.pubsub}]
++
case ejabberd_captcha:is_feature_available() of
true -> [{captcha_protected, Config#config.captcha_protected}];
false -> []
end ++
[{captcha_whitelist,
lists:map(fun jid:make/1, ?SETS:to_list(Config#config.captcha_whitelist))}]
true ->
[{captcha_protected, Config#config.captcha_protected},
{captcha_whitelist,
lists:map(
fun jid:make/1,
?SETS:to_list(Config#config.captcha_whitelist))}];
false ->
[]
end
++
case mod_muc_log:check_access_log(StateData#state.server_host, From) of
allow -> [{enablelogging, Config#config.logging}];