Changeset 17484

Timestamp:

Aug 9, 2012, 12:11:10 PM (12 years ago)

Author:

mistic100

Message:

update for the new Contact Form

Location:

extensions/CryptograPHP

Files:

• include/contactform.inc.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/CryptograPHP/include/contactform.inc.php

@@ -3 +3 @@
 
 load_language('plugin.lang', CRYPTO_PATH);
-add_event_handler('display_contactform', 'add_crypto');
-add_event_handler('check_contactform_params', 'check_crypto');
+add_event_handler('loc_begin_index', 'add_crypto');
+add_event_handler('contact_form_check', 'check_crypto', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
 
 function add_crypto()
@@ -12 +12 @@
   if (!is_a_guest()) return;
 
-  $template->set_prefilter('cf_form', 'prefilter_crypto');
+  $template->set_prefilter('index', 'prefilter_crypto');
 }
 
@@ -19 +19 @@
   global $conf;
   
-  $search = '<td class="contact-form-right"><textarea name="cf_message" id="cf_message" rows="10" cols="40">{$CF.MESSAGE}</textarea></td>';
+  $search = '{$contact.content}</textarea></td>';
   $replace = $search.'
       </tr>     
       <tr>
-        <td class="contact-form-left" style="vertical-align:top;">
+        <td class="title">
           {\''.($conf['cryptographp']['captcha_type']=='string'?'Enter code':'Solve equation').'\'|@translate}
-          <img id="captcha" src="{$ROOT_URL}'.CRYPTO_PATH.'securimage/securimage_show.php" alt="CAPTCHA Image">
-          <a href="#" onclick="document.getElementById(\'captcha\').src = \'{$ROOT_URL}'.CRYPTO_PATH.'securimage/securimage_show.php?\' + Math.random(); return false">
-            <img src="{$ROOT_URL}'.CRYPTO_PATH.'template/refresh.png"></a>
         </td>
-        <td class="contact-form-right"><input type="text" name="captcha_code" size="'.($conf['cryptographp']['code_length']+1).'" maxlength="'.$conf['cryptographp']['code_length'].'" /></td>';
+        <td>
+          <input type="text" name="captcha_code" id="captcha_code" size="'.($conf['cryptographp']['code_length']+1).'" maxlength="'.$conf['cryptographp']['code_length'].'" />
+          <img id="captcha" src="{$ROOT_URL}'.CRYPTO_PATH.'securimage/securimage_show.php" alt="CAPTCHA Image" style="vertical-align:top;">
+          <a href="#" id="captcha_refresh" onclick="document.getElementById(\'captcha\').src = \'{$ROOT_URL}'.CRYPTO_PATH.'securimage/securimage_show.php?\' + Math.random(); return false">
+            <img src="{$ROOT_URL}'.CRYPTO_PATH.'template/refresh.png" style="vertical-align:bottom;"></a>
+        </td>
+        
+{footer_script}
+var captcha_code = new LiveValidation("captcha_code", {ldelim} onlyOnSubmit: true, insertAfterWhatNode: "captcha_refresh" });
+captcha_code.add(Validate.Presence, {ldelim} failureMessage: "{\'Invalid Captcha\'|@translate}" });
+{/footer_script}';
   
   return str_replace($search, $replace, $content);
 }
 
-function check_crypto($infos)
+function check_crypto($action, $comment)
 {
-  if (!is_a_guest()) return $infos;
+  global $conf, $page;
   
   include_once(CRYPTO_PATH.'securimage/securimage.php');
   $securimage = new Securimage();
-  
+
+  if (!is_a_guest()) return $action;
+
   if ($securimage->check($_POST['captcha_code']) == false)
   {
-    array_push($infos['errors'], l10n('Invalid Captcha'));
+    array_push($page['errors'], l10n('Invalid Captcha'));
+    return 'reject';
   }
 
-  return $infos;
+  return $action;
 }
 

extensions/CryptograPHP/main.inc.php

@@ -58 +58 @@
     include(CRYPTO_PATH.'include/category.inc.php');
   }
-  else if ( preg_match('#contact$#', $_SERVER['REQUEST_URI']) and $conf['cryptographp']['activate_on']['contactform']) 
+  else if ( preg_match('#contact/?$#', $_SERVER['REQUEST_URI']) and $conf['cryptographp']['activate_on']['contactform']) 
   {
     include(CRYPTO_PATH.'include/contactform.inc.php');