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

captcha_host must have the port number to get protocol (EJAB-1418)

Browse Source
This commit is contained in:
Badlop 2011-03-03 00:02:28 +01:00
parent 1548a18b5e
commit e0d14c3b8d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/guide.tex
View File

@ -1633,11 +1633,11 @@ The configurable options are:
\titem{\{captcha\_cmd, Path\}}
Full path to a script that generates the image.
The default value is an empty string: \term{""}
\titem{\{captcha\_host, Host\}}
Host part of the URL sent to the user.
You can include the port number.
The URL sent to the user is formed by: \term{http://Host/captcha/}
The default value is the first hostname configured.
\titem{\{captcha\_host, HostPort\}}
Host part of the URL sent to the user,
and the port number where ejabberd listens for CAPTCHA requests.
The URL sent to the user is formed by: \term{http://Host:Port/captcha/}
The default value is: the first hostname configured, and port 5280.
\end{description}
Additionally, an \term{ejabberd\_http} listener must be enabled with the \term{captcha} option.

2
src/ejabberd.cfg.example
View File

@ -475,7 +475,7 @@
%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
%%
%% Host part of the URL sent to the user.
%% Host for the URL and port where ejabberd listens for CAPTCHA requests.
%%
%%{captcha_host, "example.org:5280"}.

4
src/ejabberd_captcha.erl
View File

@ -406,12 +406,12 @@ get_prog_name() ->
get_url(Str) ->
CaptchaHost = ejabberd_config:get_local_option(captcha_host),
TransferProt = atom_to_list(get_transfer_protocol(CaptchaHost)),
case CaptchaHost of
Host when is_list(Host) ->
TransferProt = atom_to_list(get_transfer_protocol(CaptchaHost)),
TransferProt ++ "://" ++ Host ++ "/captcha/" ++ Str;
_ ->
TransferProt ++ "://" ++ ?MYNAME ++ "/captcha/" ++ Str
"http://" ++ ?MYNAME ++ ":5280/captcha/" ++ Str
end.
get_transfer_protocol(CaptchaHost) ->