From f3b1dab916ff309370801ca5b50d4d5b3861beb1 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Tue, 13 Jul 2010 09:24:23 +0000
Subject: [PATCH] Move AkismetValidator from plone.app.discussion to
 collective.akismet.

svn path=/plone.app.discussion/trunk/; revision=37764
---
 plone/app/discussion/browser/captcha.zcml | 14 +++++++++-----
 plone/app/discussion/browser/validator.py | 12 ++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/plone/app/discussion/browser/captcha.zcml b/plone/app/discussion/browser/captcha.zcml
index 32fb67e..114caf0 100644
--- a/plone/app/discussion/browser/captcha.zcml
+++ b/plone/app/discussion/browser/captcha.zcml
@@ -19,17 +19,13 @@
         <meta:provides feature="plone.app.discussion-captcha" />
     </configure>
 
-    <configure zcml:condition="installed collective.akismet">
-        <meta:provides feature="plone.app.discussion-captcha" />
-    </configure>
-
     <!-- Captcha comment form extender -->
     <configure zcml:condition="have plone.app.discussion-captcha">
         <!-- 
           Register the Captcha form extender and validator only if there are
           plugins installed that declare to implement a Captcha solution for
           plone.app.discussion (e.g. plone.formwidget.captcha and 
-          plone.formwidget.recaptcha, collective.akismet). 
+          plone.formwidget.recaptcha). 
         -->
         <adapter
             factory=".captcha.Captcha"
@@ -43,4 +39,12 @@
             />
     </configure>
 
+    <!-- Akismet Validator -->
+    <configure zcml:condition="installed collective.akismet">
+        <adapter
+            factory="collective.akismet.validator.AkismetValidator"
+            provides="z3c.form.interfaces.IValidator"
+            />    	
+    </configure>
+	
 </configure>
\ No newline at end of file
diff --git a/plone/app/discussion/browser/validator.py b/plone/app/discussion/browser/validator.py
index 54c773d..063242f 100644
--- a/plone/app/discussion/browser/validator.py
+++ b/plone/app/discussion/browser/validator.py
@@ -33,11 +33,6 @@ try:
 except:
     pass
 
-try:
-    from collective.akismet.browser.validator import AkismetReject
-except:
-    pass
-
 from zope.interface import implements, Interface
 from zope.schema.interfaces import IField
 from zope.component import adapts
@@ -57,14 +52,11 @@ class CaptchaValidator(validator.SimpleFieldValidator):
         registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
 
-        if settings.captcha != 'disabled':
+        if settings.captcha == 'captcha' or settings.captcha == 'recaptcha':
             captcha = getMultiAdapter((aq_inner(self.context), self.request), 
                                       name=settings.captcha)
             if not captcha.verify(input=value):
-                if settings.captcha == 'akismet':
-                    raise AkismetReject
-                else:
-                    raise WrongCaptchaCode
+                 raise WrongCaptchaCode
             else:
                 return True