Changeset 665

Timestamp:

11/28/06 10:41:28

Author:

crchemist

Message:

Modified captchas tool installation to be compatible with Plone-2.0.5

Files:

• qPloneCaptchas/trunk/CaptchaTool.py (modified) (1 diff)
• qPloneCaptchas/trunk/Extensions/Install.py (modified) (3 diffs)
• qPloneCaptchas/trunk/__init__.py (modified) (1 diff)

qPloneCaptchas/trunk/CaptchaTool.py

@@ -3 +3 @@
-from AccessControl import ClassSecurityInfo
-
-def constructCaptchaTool(self, id, title='', timeout_mins=20,
-                         addNotification=None, delNotification=None,
-                         limit=0, period_secs=20,
-                         REQUEST=None):
-    ob = CaptchaTool(id, title, timeout_mins,
-                     addNotification, delNotification,
-                     limit=limit, period_secs=period_secs)
-    self._setObject(id, ob)
-    if REQUEST is not None:
-        return self.manage_main(self, REQUEST, update_menu=1)
-
-class CaptchaTool(TransientObjectContainer):
-    """portal_captcha tool class
-    """
+    meta_type = 'CaptchaTool'
-    security = ClassSecurityInfo()
-    security.declarePublic('addExpiredKey')
+
+    def __init__(self, id='portal_captchas', title='', timeout_mins=60, addNotification=None,
+                 delNotification=None, limit=0, period_secs=60):
+        TransientObjectContainer.__init__(self, id, title, timeout_mins, addNotification,
+                                          delNotification, limit, period_secs)
+
-    def addExpiredKey(self, key):
-        self.new(key)

qPloneCaptchas/trunk/Extensions/Install.py

@@ -1 +1 @@
-from Products.qPloneCaptchas.config import *
-from Products.qPloneCaptchas.CaptchaTool import constructCaptchaTool
-from Products.CMFCore.utils import getToolByName
-from StringIO import StringIO
@@ -15 +14 @@
-    portal = getToolByName(self, 'portal_url').getPortalObject()
-    # add captchas_tool
-
-
+
-
-    safeEditProperty(self, 'captcha_key', generateKey(8))
@@ -101 +99 @@
-    for i in range(length): key += str(randint(0, 9))
-    return key
+
+def install_tool(self, out):
+    if not hasattr(self, 'portal_captchas'):
+        addTool = self.manage_addProduct['qPloneCaptchas'].manage_addTool
+        addTool('CaptchaTool')

qPloneCaptchas/trunk/__init__.py

@@ -11 +11 @@
-tools = (CaptchaTool.CaptchaTool, )
-def initialize(context):
-
-
-
-
+
-             tools=tools,
+             product_name=config.PRODUCT_NAME,
-             icon=config.TOOL_ICON,).initialize(context)