modify EGov_createNewProcedure and EGov_register to ask captcha if a user want...

modify EGov_createNewProcedure and EGov_register to ask captcha if a user want to create a new document without been authenticated.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23322 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_createNewProcedure.xml

@@ -67,15 +67,21 @@
             <key> <string>_body</string> </key>
             <value> <string>request=context.REQUEST\n
 \n
-portal_type = new_application_procedure\n
-module = context.getDefaultModule(portal_type=portal_type)\n
-# Create a new procedure\n
-new_procedure = module.newContent(portal_type=portal_type)\n
+if context.portal_membership.isAnonymousUser() and not captcha_ok:\n
+  absolute_url = context.absolute_url()\n
+  new_url = \'captcha/CaptchaAdvertisment\'\n
+  redirect_url = "%s/%s" % (absolute_url, new_url)\n
+else:\n
+  portal_type = new_application_procedure\n
+  module = context.getDefaultModule(portal_type=portal_type)\n
+  # Create a new procedure\n
+  new_procedure = module.newContent(portal_type=portal_type)\n
 \n
-absolute_url = context.absolute_url()\n
-module_id = module.getId()\n
-new_object_id = new_procedure.getId()\n
-redirect_url = "%s/%s/%s/%s" % (absolute_url, module_id, new_object_id, \'view\')\n
+  absolute_url = context.absolute_url()\n
+  module_id = module.getId()\n
+  new_object_id = new_procedure.getId()\n
+\n
+  redirect_url = "%s/%s/%s/%s" % (absolute_url, module_id, new_object_id, \'view\')\n
 \n
 result = request[\'RESPONSE\'].redirect(redirect_url) \n
 return result\n
@@ -101,7 +107,7 @@ return result\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>new_application_procedure</string> </value>
+            <value> <string>new_application_procedure, captcha_ok=False</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -121,23 +127,25 @@ return result\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
                             <string>new_application_procedure</string>
+                            <string>captcha_ok</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>request</string>
+                            <string>absolute_url</string>
+                            <string>new_url</string>
+                            <string>redirect_url</string>
                             <string>portal_type</string>
                             <string>module</string>
                             <string>new_procedure</string>
-                            <string>absolute_url</string>
                             <string>module_id</string>
                             <string>new_object_id</string>
-                            <string>redirect_url</string>
                             <string>_getitem_</string>
                             <string>result</string>
                           </tuple>
@@ -151,13 +159,21 @@ return result\n
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <int>0</int>
+              </tuple>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>EGov_createNewProcedure</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml

@@ -75,7 +75,7 @@ if not context.isCaptchaTextCorrect(captcha_text):\n
              "%s/%s?portal_status_message=%s" %\n
              (context.absolute_url(), form_id, translated_message))\n
 \n
-return context.EGov_createNewProcedure(new_application_procedure=\'Subscription Form\')\n
+return context.EGov_createNewProcedure(new_application_procedure=\'Subscription Form\', captcha_ok=True)\n
 </string> </value>
         </item>
         <item>
@@ -141,6 +141,7 @@ return context.EGov_createNewProcedure(new_application_procedure=\'Subscription
                             <string>message</string>
                             <string>translated_message</string>
                             <string>_getitem_</string>
+                            <string>True</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewPendingApplicationList/listbox.xml

@@ -310,6 +310,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -361,7 +367,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>hidden_label</string> </value>
                 </item>
                 <item>
                     <key> <string>default_params</string> </key>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewPendingApplicationList/listbox_getCreationDate.xml

@@ -242,6 +242,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>

bt5/erp5_egov/bt/revision

-270
+274
\ No newline at end of file