r1302 - in xwiki/trunk/src/main/java/com/xpn/xwiki: . plugin/captcha web

[Phung Hai Nam]

Author: namphunghai
Date: 2006-09-11 13:12:10 +0200 (Mon, 11 Sep 2006)
New Revision: 1302

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPlugin.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
Log:
XWIKI-118. Update the code for captcha

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-11 07:20:11 UTC (rev 1301)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-11 11:12:10 UTC (rev 1302)
@@ -4014,6 +4014,13 @@
             return false;
     }
 
+    public boolean hasCaptcha(XWikiContext context) {
+        if (context.getWiki().ParamAsLong("xwiki.plugin.captcha", 0) == 1)
+            return true;
+        else
+            return false;
+    }
+
     public String clearName(String name, XWikiContext context) {
         name = name.replaceAll("[àâä]","a");
         name = name.replaceAll("[éèêë]","e");

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPlugin.java	2006-09-11 07:20:11 UTC (rev 1301)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPlugin.java	2006-09-11 11:12:10 UTC (rev 1302)
@@ -68,7 +68,6 @@
     }
 
     public String displayCaptcha(CaptchaParams captchaParams, String classname, XWikiContext context) throws XWikiException {
-        if (context.getWiki().ParamAsLong("xwiki.plugin.captcha", 0) != 1) return "";
         StringBuffer output = new StringBuffer();
         String user = (String) captchaParams.get("user");
         String action = (String) captchaParams.get("action");
@@ -106,7 +105,6 @@
     }
 
     public Boolean verifyCaptcha(CaptchaParams captchaParams, XWikiContext context) throws XWikiException {
-        if (context.getWiki().ParamAsLong("xwiki.plugin.captcha", 0) != 1) return Boolean.TRUE;
         String user = (String) captchaParams.get("user");
         String action = (String) captchaParams.get("action");
         String actionuser;

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java	2006-09-11 07:20:11 UTC (rev 1301)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java	2006-09-11 11:12:10 UTC (rev 1302)
@@ -48,7 +48,7 @@
 
         // Add captcha plugin to avoid spam robots
         CaptchaPluginApi captchaPluginApi = (CaptchaPluginApi) xwiki.getPluginApi("jcaptcha", context);
-        if (captchaPluginApi != null) vcontext.put("captchaPlugin", captchaPluginApi);
+        if (xwiki.hasCaptcha(context) && captchaPluginApi != null) vcontext.put("captchaPlugin", captchaPluginApi);
         else vcontext.put("captchaPlugin", "noCaptchaPlugin");
 
         // Check for edit section