Changeset 438

Timestamp:

02.03.2009 15:03:09 (3 years ago)

Author:

chris

Message:

• bug fixed if PIL is not available

Location:

CMESS/captcha/trunk/com/zms/captcha

Files:

• README.txt (modified) (1 diff)
• c_captcha_basic.py (modified) (3 diffs)
• zms/captcha.metaobj.xml (modified) (4 diffs)

CMESS/captcha/trunk/com/zms/captcha/README.txt

@@ -25 +25 @@
 HISTORY
 
+v1.1.1.200903021501
+- bug fixed if PIL is not available
+
 v1.1.0.200901211350
 - added ReCaptcha-service

CMESS/captcha/trunk/com/zms/captcha/c_captcha_basic.py

@@ -1 +1 @@
 from com.zms.captcha.CaptchasDotNet import CaptchasDotNet
-from com.zms.captcha.PILCaptcha import *
+try:
+        from com.zms.captcha.PILCaptcha import *
+        noPIL = False
+except:
+        noPIL = True
 from com.zms.captcha.reCaptcha import *
 
@@ -59 +63 @@
         def __init__(self, zms_context):
                 C_Captcha_Basic.__init__(self, zms_context)
-                
+
                 self.id = 'PILCaptcha'
         
         def GetContent(self):
+                if noPIL:
+                        raise Exception
+
                 temp_img = generateImage(self.zms_context.temp_folder, 
                                                                                                                         self.zms_context.attr_captcha.getObjProperty('pilcaptchaCharCount', self.zms_context.REQUEST), 
@@ -76 +83 @@
         
         def IsCodeValid(self):
+                if noPIL:
+                        raise Exception
+        
                 if (self.zms_context.REQUEST.SESSION['sess_captcha'] == self.zms_context.REQUEST.form.get('captcha_password', '')):
                         temp_result = (True, '')

CMESS/captcha/trunk/com/zms/captcha/zms/captcha.metaobj.xml

@@ -426 +426 @@
         temp_handler_available = False 
 
+
 def captcha_getContent(zms_context):
         if (zms_context.attr_captcha.getObjProperty('captchaService', zms_context.REQUEST) == 'static_pics'):
                 temp_result = zms_context.dt_html(zms_context.getMetaobjAttr('ZMSCaptchaLib', 'captcha_renderDisplay')['custom'], zms_context.REQUEST)
         elif (temp_handler_available):
-                temp_handler = C_Handler_Captcha(zms_context)
-                temp_result = temp_handler.GetCaptchaContent()
+                try:
+                        temp_handler = C_Handler_Captcha(zms_context)
+                        temp_result = temp_handler.GetCaptchaContent()
+                except:
+                        temp_result = zms_context.getLangStr('captchaHandlerNotAvailable', zms_context.REQUEST.get('lang', zms_context.getPrimaryLanguage()))
         else:
                 temp_result = zms_context.getLangStr('captchaHandlerNotAvailable', zms_context.REQUEST.get('lang', zms_context.getPrimaryLanguage()))
@@ -455 +459 @@
                 temp_result = zms_context.dt_html(zms_context.getMetaobjAttr('ZMSCaptchaLib', 'captcha_staticValidation')['custom'], zms_context.REQUEST)
         elif(temp_handler_available):
-                temp_handler = C_Handler_Captcha(zms_context)
-                temp_result = temp_handler.IsCodeValid()
+                try:
+                        temp_handler = C_Handler_Captcha(zms_context)
+                        temp_result = temp_handler.IsCodeValid()
+                except:
+                        temp_result = zms_context.getLangStr('captchaHandlerNotAvailable', zms_context.REQUEST.get('lang', zms_context.getPrimaryLanguage()))
         else:
                 temp_result = zms_context.getLangStr('captchaHandlerNotAvailable', zms_context.REQUEST.get('lang', zms_context.getPrimaryLanguage()))
@@ -536 +543 @@
 <item key="name"><![CDATA[CaptchaLib]]></item>
 <item key="package"><![CDATA[com.zms.captcha]]></item>
-<item key="revision"><![CDATA[1.1.0]]></item>
+<item key="revision"><![CDATA[1.1.1]]></item>
 <item key="type"><![CDATA[ZMSLibrary]]></item>
 </dictionary>
@@ -567 +574 @@
 <item key="name"><![CDATA[com.zms.captcha]]></item>
 <item key="package"></item>
-<item key="revision"><![CDATA[1.1.0]]></item>
+<item key="revision"><![CDATA[1.1.1]]></item>
 <item key="type"><![CDATA[ZMSPackage]]></item>
 </dictionary>