[xoops-svn] SF.net SVN: xoops-svn:[12171] XoopsModules/contact/trunk/contact

[<ce...@us...>]

Revision: 12171
          http://sourceforge.net/p/xoops/svn/12171
Author:   cesag
Date:     2013-10-13 02:15:04 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Fixed an error when sending Captcha (Montuy337513 alias black_beard)

Modified Paths:
--------------
    XoopsModules/contact/trunk/contact/class/contact.php
    XoopsModules/contact/trunk/contact/docs/changelog.txt
    XoopsModules/contact/trunk/contact/index.php

Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php	2013-10-13 02:02:44 UTC (rev 12170)
+++ XoopsModules/contact/trunk/contact/class/contact.php	2013-10-13 02:15:04 UTC (rev 12171)
@@ -129,7 +129,7 @@
                 || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
             ) {
                 xoops_load('XoopsFormCaptcha');
-                $form->addElement(new XoopsFormCaptcha('','',false), true);
+                $form->addElement(new XoopsFormCaptcha('','xoopscaptcha',false), true);
             }
 
         $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));

Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt	2013-10-13 02:02:44 UTC (rev 12170)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt	2013-10-13 02:15:04 UTC (rev 12171)
@@ -6,6 +6,7 @@
 - PSR-2 code reformatting (mamba)
 - making Captcha optional for Anonymous/Registered users (mamba)
 - Fixed an error when sending anonymous (mamba)
+- Fixed an error when sending Captcha (Montuy337513 alias black_beard)
 
 Version 1.80 from 2012-1-19
 =================================

Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php	2013-10-13 02:02:44 UTC (rev 12170)
+++ XoopsModules/contact/trunk/contact/index.php	2013-10-13 02:15:04 UTC (rev 12171)
@@ -47,7 +47,6 @@
             redirect_header(XOOPS_URL, 3, _MD_CONTACT_MES_ERROR);
             exit();
         } else {
-
             // check captcha
             if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
                 || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
@@ -56,7 +55,6 @@
                 xoops_load('XoopsCaptcha');
                 if (class_exists('XoopsFormCaptcha')) {
                     $xoopsCaptcha = XoopsCaptcha::getInstance();
-                    $xoopsCaptcha->active = false;
                     if (!$xoopsCaptcha->verify()) {
                         // $err[] = $xoopsCaptcha->getMessage();
                         redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
@@ -92,8 +90,8 @@
             } else {
                 $message = _MD_CONTACT_MES_SENDERROR;
             }
-
             redirect_header(XOOPS_URL, 3, $message);
+			exit();
         }
 
         break;