Changeset 1955 in products

Timestamp:

Mar 19, 2010 10:35:58 AM (14 years ago)

Author:

mylan

Message:

#172: Fix 'plone_captchas' references to 'captcha_core'

Location:

quintagroup.captcha.core/trunk/quintagroup/captcha/core

Files:

• config.py (modified) (1 diff)
• skins/captcha_core/getCaptchaType.py (modified) (2 diffs)
• skins/captcha_core/prefs_captchas_setup.cpy (modified) (2 diffs)

quintagroup.captcha.core/trunk/quintagroup/captcha/core/config.py

@@ -4 +4 @@
 CAPTCHAS_COUNT = 165
 
-LAYERS = ['captchas', 'plone_captchas', 'captchas_discussion', 
-    'captchas_sendto_form', 'captchas_join_form']
-LAYER_DYNAMIC_CAPTCHAS = 'plone_captchas/dynamic'
-LAYER_STATIC_CAPTCHAS = 'plone_captchas/static'
+LAYERS = ['captchas', 'captcha_core']
+LAYER_DYNAMIC_CAPTCHAS = 'captcha_core/dynamic'
+LAYER_STATIC_CAPTCHAS = 'captcha_core/static'
 ALL_LAYERS = LAYERS + [LAYER_STATIC_CAPTCHAS, LAYER_DYNAMIC_CAPTCHAS]
 
 #TOOL_ICON = 'tool.gif'
-TOOL_ICON = 'skins/plone_captchas/tool.gif'
+TOOL_ICON = 'skins/captcha_core/tool.gif'
 TOOL_ID = 'portal_captchas'
 CONFIGLET_ID = "qpc_tool"

quintagroup.captcha.core/trunk/quintagroup/captcha/core/skins/captcha_core/getCaptchaType.py

@@ -8 +8 @@
 ##title=
 ##
+import string
 from Products.CMFCore.utils import getToolByName
-import string
+from quintagroup.captcha.core.config import LAYER_DYNAMIC_CAPTCHAS
+from quintagroup.captcha.core.config import LAYER_STATIC_CAPTCHAS
+
 skinsTool = getToolByName(context, 'portal_skins')
 default_skin = skinsTool.getDefaultSkin()
@@ -15 +18 @@
 path = map( string.strip, string.split( path,',' ) )
 
-if 'plone_captchas/static' in path:
+if LAYER_STATIC_CAPTCHAS in path:
     return 'static'
-elif 'plone_captchas/dynamic' in path:
+elif LAYER_DYNAMIC_CAPTCHAS in path:
     return 'dynamic'
 else:

quintagroup.captcha.core/trunk/quintagroup/captcha/core/skins/captcha_core/prefs_captchas_setup.cpy

@@ -11 +11 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone import PloneMessageFactory as _
+from quintagroup.captcha.core.config import LAYER_DYNAMIC_CAPTCHAS
+from quintagroup.captcha.core.config import LAYER_STATIC_CAPTCHAS
 
 import string
@@ -32 +34 @@
 skinstool = getToolByName(context, 'portal_skins')
 if ct == 'static':
-    exchangeLayers('plone_captchas/dynamic', 'plone_captchas/static')
+    exchangeLayers(LAYER_DYNAMIC_CAPTCHAS, LAYER_STATIC_CAPTCHAS)
 else:
-    exchangeLayers('plone_captchas/static', 'plone_captchas/dynamic')
+    exchangeLayers(LAYER_STATIC_CAPTCHAS, LAYER_DYNAMIC_CAPTCHAS)
 
 captcha_props = getToolByName(context, 'portal_properties')['qPloneCaptchas']