diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-29 11:39:40 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-29 11:39:40 +0300 |
| commit | b82b93f8f0c229e94a89469b0754bab0e28cd17c (patch) | |
| tree | 56f5c7a25aa19254b4f30b1cf33fc34dcbadcbb7 /src/ejabberd_web_admin.erl | |
| parent | Don't re-define validation functions in multiple places (diff) | |
Don't validate an option in ejabberd_config:get_option() functions
The commit introduces the following changes:
* Now there is no need to pass validating function in
ejabberd_config:get_option() functions, because the configuration
keeps already validated values.
* New function ejabberd_config:get_option/1 is introduced
* Function ejabberd_config:get_option/3 is deprecated. If the function
is still called, the second argument (validating function) is simply
ignored.
* The second argument for ejabberd_config:get_option/2 is now
a default value, not a validating function.
Diffstat (limited to 'src/ejabberd_web_admin.erl')
| -rw-r--r-- | src/ejabberd_web_admin.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 5547ab783..57b679a2e 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -920,12 +920,7 @@ process_admin(Host, end; _ -> nothing end, - Rules = case ejabberd_config:get_option( - {access, Name, Host}, fun(V) -> V end) - of - undefined -> []; - Rs1 -> Rs1 - end, + Rules = ejabberd_config:get_option({access, Name, Host}, []), make_xhtml([?XC(<<"h1">>, (str:format( ?T(<<"~s access rule configuration">>), |