From: Badlop <badlop@process-one.net>
Date: Mon, 11 Jan 2010 22:21:23 +0000 (+0000)
Subject: Show and throw error when captcha_cmd is required but not configured.
X-Git-Tag: v2.1.2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f643ce9b85a28114b9455480f2715aff88e314a;p=ejabberd

Show and throw error when captcha_cmd is required but not configured.

SVN Revision: 2874
---

diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
index 317798862..4d3d2e009 100644
--- a/src/ejabberd_captcha.erl
+++ b/src/ejabberd_captcha.erl
@@ -328,7 +328,9 @@ get_prog_name() ->
 	FileName when is_list(FileName) ->
 	    FileName;
 	_ ->
-	    ""
+	    ?CRITICAL_MSG("The option captcha_cmd is not configured, but some "
+			  "module wants to use the CAPTCHA feature.", []),
+	    throw({error, option_not_configured_captcha_cmd})
     end.
 
 get_url(Str) ->
@@ -388,9 +390,10 @@ return(Port, TRef, Result) ->
     Result.
 
 is_feature_enabled() ->
-    case get_prog_name() of
-	"" -> false;
+    try get_prog_name() of
 	Prog when is_list(Prog) -> true
+    catch 
+	_:_ -> false
     end.
 
 is_feature_available() ->