Changeset 3457 in products for quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/captcha.py

Timestamp:

Apr 26, 2012 12:21:41 PM (12 years ago)

Author:

vmaksymiv

Message:

merged with captcha_provider branch

Location:

quintagroup.plonecaptchas/trunk

Files:

• . (modified) (1 prop)
• quintagroup/plonecaptchas/captcha.py (modified) (3 diffs)

quintagroup.plonecaptchas/trunk

@@ +1 @@
+/quintagroup.plonecaptchas/branches/captcha_provider:3438-3456
 /quintagroup.plonecaptchas/branches/split2packs:1946-2024

@@ +1 @@
+/quintagroup.plonecaptchas/branches/captcha_provider:3438-3456
 /quintagroup.plonecaptchas/branches/split2packs:1946-2024

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/captcha.py

@@ -3 +3 @@
 from plone.app.discussion import vocabularies
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-from z3c.form import interfaces
-from quintagroup.plonecaptchas.config import CAPTCHA_NAME
 from quintagroup.plonecaptchas.interfaces import IQGDiscussionCaptchas
+from quintagroup.plonecaptchas.interfaces import ICaptchaProvider
 from zope.interface import Interface
-from zope.component import adapts
+from zope.component import adapts, getUtilitiesFor, queryUtility
 from plone.app.discussion.browser.comments import CommentForm
+
+
+class CaptchaProvider(object):
+
+    def __init__(self):
+        self.widget_factory = CaptchaWidgetFactory
 
 
@@ -16 +21 @@
     def update(self):
         super(CaptchaExtender, self).update()
-        if self.captcha == CAPTCHA_NAME and self.isAnon:
-            self.form.fields['captcha'].widgetFactory = CaptchaWidgetFactory
-            if self.form.fields['captcha'].mode == interfaces.HIDDEN_MODE:
+        if self.isAnon:
+            captcha_provider = queryUtility(ICaptchaProvider,
+                                            name=self.captcha)
+            if captcha_provider:
+                self.form.fields['captcha'].widgetFactory = \
+                                                captcha_provider.widget_factory
                 self.form.fields['captcha'].mode = None
 
@@ -25 +33 @@
     """ Extend captcha vocabulary with quintagroup.plonecaptchas"""
     terms = vocabularies.captcha_vocabulary(context)._terms
-    terms.append(SimpleTerm(value=CAPTCHA_NAME,
-                            token=CAPTCHA_NAME,
-                            title=CAPTCHA_NAME))
+    captchas = set((t.value for t in terms))
+
+    providers = getUtilitiesFor(ICaptchaProvider)
+    for name, util in providers:
+        if name and name not in captchas:
+            terms.append(SimpleTerm(value=name,
+                                    token=name,
+                                    title=name.capitalize()))
     return SimpleVocabulary(terms)

@@ +1 @@
+/quintagroup.plonecaptchas/branches/captcha_provider:3438-3456
 /quintagroup.plonecaptchas/branches/split2packs:1946-2024