From e0d14c3b8d84f5249e388844f7901fed88b18209 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 3 Mar 2011 00:02:28 +0100
Subject: captcha_host must have the port number to get protocol (EJAB-1418)

---
 src/ejabberd.cfg.example | 2 +-
 src/ejabberd_captcha.erl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index 52ffc6825..0912bf559 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -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"}.
 
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
index 455ffad9d..0f3aee76c 100644
--- a/src/ejabberd_captcha.erl
+++ b/src/ejabberd_captcha.erl
@@ -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) ->
-- 
cgit v1.2.3