diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
| commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
| tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/ejabberd_captcha.erl | |
| parent | Log modules startup (diff) | |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to 'src/ejabberd_captcha.erl')
| -rw-r--r-- | src/ejabberd_captcha.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl index a70ad124..1d3e99c5 100644 --- a/src/ejabberd_captcha.erl +++ b/src/ejabberd_captcha.erl @@ -45,7 +45,6 @@ config_reloaded/0, process_iq/1]). -include("xmpp.hrl"). --include("ejabberd.hrl"). -include("logger.hrl"). -include("ejabberd_http.hrl"). @@ -365,12 +364,12 @@ terminate(_Reason, #state{enabled = Enabled}) -> register_handlers() -> ejabberd_hooks:add(host_up, ?MODULE, host_up, 50), ejabberd_hooks:add(host_down, ?MODULE, host_down, 50), - lists:foreach(fun host_up/1, ?MYHOSTS). + lists:foreach(fun host_up/1, ejabberd_config:get_myhosts()). unregister_handlers() -> ejabberd_hooks:delete(host_up, ?MODULE, host_up, 50), ejabberd_hooks:delete(host_down, ?MODULE, host_down, 50), - lists:foreach(fun host_down/1, ?MYHOSTS). + lists:foreach(fun host_down/1, ejabberd_config:get_myhosts()). code_change(_OldVsn, State, _Extra) -> {ok, State}. @@ -445,7 +444,7 @@ get_url(Str) -> <<TransferProt/binary, ":", Host/binary, ":", PortString/binary, "/captcha/", Str/binary>>; _ -> - <<"http://", (?MYNAME)/binary, "/captcha/", Str/binary>> + <<"http://", (ejabberd_config:get_myname())/binary, "/captcha/", Str/binary>> end. get_transfer_protocol(PortString) -> |