Changeset 304

Timestamp:

21.11.2008 15:12:22 (3 years ago)

Author:

mike

Message:

 

Location:

CMESS/forum/branches/captcha

Files:

• . (copied) (copied from CMESS/forum/trunk)
• org/cmess/forum/zms/zmsforum.metaobj.xml (modified) (12 diffs)

CMESS/forum/branches/captcha/org/cmess/forum/zms/zmsforum.metaobj.xml

@@ -91 +91 @@
 <item key="repetitive" type="int">0</item>
 <item key="type"><![CDATA[boolean]]></item>
+</dictionary>
+</item>
+<item type="dictionary"><dictionary>
+<item key="id"><![CDATA[zfEnableCaptcha]]></item>
+<item key="keys" type="list"><list>
+<item><![CDATA[captcha.net]]></item>
+</list>
+</item>
+<item key="mandatory" type="int">0</item>
+<item key="multilang" type="int">1</item>
+<item key="name"><![CDATA[Captcha?]]></item>
+<item key="repetitive" type="int">0</item>
+<item key="type"><![CDATA[select]]></item>
 </dictionary>
 </item>
@@ -733 +746 @@
 - zfmEmail value
 - zfmBody text
+- captcha content
 </dtml-comment>
 
@@ -768 +782 @@
                         <input type="file" name="zfmFile" size="19">
                 </div>
+                <div class="field">
+                        %s
+                </div>
         </fieldset>
         <input type="submit" name="btn" value="<dtml-var "getLangStr('zfBtnSend', lang)">">
@@ -1044 +1061 @@
 <item key="name"><![CDATA[Forum]]></item>
 <item key="package"><![CDATA[org.cmess.forum]]></item>
-<item key="revision"><![CDATA[1.0.0]]></item>
+<item key="revision"><![CDATA[1.1.0]]></item>
 <item key="type"><![CDATA[ZMSObject]]></item>
 </dictionary>
@@ -1192 +1209 @@
         return temp_result
 
+def checkCaptcha():
+        temp_captcha_mode = context.getObjProperty('zfEnableCaptcha', REQUEST)
+        if ((temp_captcha_mode is not None) and (len(temp_captcha_mode) > 0)):
+                temp_result = context.ZMSForum_isCaptchaValid(temp_captcha_mode, REQUEST)
+        else:
+                temp_result = (True, '')
+                
+        return temp_result
+
 def checkNewEmail():
         temp_err = []
@@ -1212 +1238 @@
                 temp_err.extend(temp_email_err)
                 
+        temp_captcha_err = checkCaptcha()
+        if (not temp_captcha_err[0]):
+                temp_err.append(temp_captcha_err[1])
+                
         return (len(temp_err) > 0) and temp_err or None
+
+def getCaptchaContent():
+        temp_captcha_mode = context.getObjProperty('zfEnableCaptcha', REQUEST)
+        if ((temp_captcha_mode is not None) and (len(temp_captcha_mode) > 0)):
+                temp_captcha_content = context.ZMSForum_getCaptchaContent(temp_captcha_mode)
+        else:
+                temp_captcha_content = ''
+                
+        return temp_captcha_content
 
 def handleDisplayHelp():
@@ -1246 +1285 @@
                                                                                                         'AW: ' + temp_msg[0]['zfmSubject'], 
                                                                                                         REQUEST.get('zfmAuthor', REQUEST.cookies.get('__ac_author', '')), 
-                                                                                                        REQUEST.get('zfmEmail', REQUEST.cookies.get('__ac_email', '')), temp_text)
+                                                                                                        REQUEST.get('zfmEmail', REQUEST.cookies.get('__ac_email', '')), temp_text, getCaptchaContent())
                 else:
                         temp_err_list, temp_result = processError(context.getLangStr('zfErrMsgNotFound', temp_lang), handleDisplayOverview)
@@ -1253 +1292 @@
                                                                                                 'insertReply', context.getLangStr('zfReplyMessage', temp_lang), 
                                                                                                 REQUEST.form.get('zfmSubject', ''), REQUEST.form.get('zfmAuthor', ''), 
-                                                                                                REQUEST.form.get('zfmEmail', ''), REQUEST.form.get('zfmBody', ''))
+                                                                                                REQUEST.form.get('zfmEmail', ''), REQUEST.form.get('zfmBody', ''), getCaptchaContent())
         else:
                 temp_err_list, temp_result = processError(context.getLangStr('zfErrParams', temp_lang), handleDisplayMessage)
@@ -1326 +1365 @@
                                                                                         context.getLangStr('zfInsertTopic', temp_lang), REQUEST.form.get('zfmSubject', ''), 
                                                                                         REQUEST.form.get('zfmAuthor', ''), REQUEST.form.get('zfmEmail', ''), 
-                                                                                        REQUEST.form.get('zfmBody', ''))
+                                                                                        REQUEST.form.get('zfmBody', ''), getCaptchaContent())
+        elif (REQUEST.form.has_key('captcha_new')):
+                temp_err_list = None
+                temp_result = (context.getObjProperty('newMessageForm', REQUEST))%('', 'insertNew', 
+                                                                                        context.getLangStr('zfInsertTopic', temp_lang), REQUEST.form.get('zfmSubject', ''), 
+                                                                                        REQUEST.form.get('zfmAuthor', ''), REQUEST.form.get('zfmEmail', ''), 
+                                                                                        REQUEST.form.get('zfmBody', ''), getCaptchaContent())
         else:
                 temp_err_list = None
                 temp_result = (context.getObjProperty('newMessageForm', REQUEST))%('', 'insertNew', 
-                                                                                        context.getLangStr('zfInsertTopic', temp_lang), '', '', '', '')
+                                                                                        context.getLangStr('zfInsertTopic', temp_lang), '', '', '', '', getCaptchaContent())
         
         return (temp_err_list, temp_result)
@@ -2186 +2231 @@
 </dictionary>
 </item>
+<item type="dictionary"><dictionary>
+<item key="custom"><![CDATA[from org.cmess.forum.c_handler_captcha import C_Handler_Captcha 
+
+def ZMSForum_getCaptchaContent(captcha_mode):
+  temp_handler = C_Handler_Captcha(captcha_mode)
+  temp_result = temp_handler.GetCaptchaContent()
+  
+  return temp_result]]></item>
+<item key="id"><![CDATA[ZMSForum_getCaptchaContent]]></item>
+<item key="mandatory" type="int">0</item>
+<item key="multilang" type="int">0</item>
+<item key="name"><![CDATA[ZMSForum_getCaptchaContent]]></item>
+<item key="repetitive" type="int">0</item>
+<item key="type"><![CDATA[External Method]]></item>
+</dictionary>
+</item>
+<item type="dictionary"><dictionary>
+<item key="custom"><![CDATA[from org.cmess.forum.c_handler_captcha import C_Handler_Captcha 
+
+def ZMSForum_isCaptchaValid(captcha_mode, REQUEST):
+  temp_handler = C_Handler_Captcha(captcha_mode)
+  temp_result = temp_handler.IsCodeValid(REQUEST)
+  
+  return temp_result]]></item>
+<item key="id"><![CDATA[ZMSForum_isCaptchaValid]]></item>
+<item key="mandatory" type="int">0</item>
+<item key="multilang" type="int">0</item>
+<item key="name"><![CDATA[ZMSForum_isCaptchaValid]]></item>
+<item key="repetitive" type="int">0</item>
+<item key="type"><![CDATA[External Method]]></item>
+</dictionary>
+</item>
 </list>
 </item>
@@ -2207 +2284 @@
 <item key="name"><![CDATA[Library]]></item>
 <item key="package"><![CDATA[org.cmess.forum]]></item>
-<item key="revision"><![CDATA[1.0.0]]></item>
+<item key="revision"><![CDATA[1.1.0]]></item>
 <item key="type"><![CDATA[ZMSLibrary]]></item>
 </dictionary>
@@ -2765 +2842 @@
 <item key="name"><![CDATA[org.cmess.forum]]></item>
 <item key="package"></item>
-<item key="revision"><![CDATA[1.0.0]]></item>
+<item key="revision"><![CDATA[1.1.0]]></item>
 <item key="type"><![CDATA[ZMSPackage]]></item>
 </dictionary>