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

[<be...@us...>]

Revision: 12161
          http://sourceforge.net/p/xoops/svn/12161
Author:   beckmi
Date:     2013-10-07 20:46:22 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
making Captcha optional (mamba)

Modified Paths:
--------------
    XoopsModules/contact/trunk/contact/class/contact.php
    XoopsModules/contact/trunk/contact/docs/changelog.txt
    XoopsModules/contact/trunk/contact/index.php
    XoopsModules/contact/trunk/contact/language/english/modinfo.php
    XoopsModules/contact/trunk/contact/xoops_version.php

Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php	2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/class/contact.php	2013-10-07 20:46:22 UTC (rev 12161)
@@ -56,7 +56,7 @@
 
     public function Contact_ContactForm($department)
     {
-        global $xoopsConfig, $xoopsOption, $xoopsUser;
+        global $xoopsConfig, $xoopsOption, $xoopsUser,$xoopsModuleConfig;
         if ($this->isNew()) {
             if (!empty($xoopsUser)) {
                 $contact_uid      = $xoopsUser->getVar('uid');
@@ -123,8 +123,10 @@
         $form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
         $form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
 
-        xoops_load('XoopsFormCaptcha');
-        $form->addElement(new XoopsFormCaptcha(), true);
+        if ($xoopsModuleConfig['captcha']) {
+            xoops_load('XoopsFormCaptcha');
+            $form->addElement(new XoopsFormCaptcha(), 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-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt	2013-10-07 20:46:22 UTC (rev 12161)
@@ -4,6 +4,7 @@
 - English corrections (Cesag)
 - fixed: bug when sending UTF-8 emails (cesag/mamba)
 - PSR-2 code reformatting (mamba)
+- making Captcha optional (mamba)
 
 Version 1.80 from 2012-1-19
 =================================

Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php	2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/index.php	2013-10-07 20:46:22 UTC (rev 12161)
@@ -48,13 +48,20 @@
         } else {
 
             // check captcha
-            xoops_load("captcha");
-            $xoopsCaptcha = XoopsCaptcha::getInstance();
-            if (!$xoopsCaptcha->verify()) {
-                redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
-                exit();
+            if ($xoopsModuleConfig['captcha']) {
+                // Verify entered code
+                xoops_load('XoopsCaptcha');
+                if (class_exists('XoopsFormCaptcha')) {
+                    $xoopsCaptcha = XoopsCaptcha::getInstance();
+                    if (!$xoopsCaptcha->verify()) {
+                        // $err[] = $xoopsCaptcha->getMessage();
+                        redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
+                        exit();
+                    }
+                }
             }
 
+
             // check email
             if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
                 redirect_header("javascript:history.go(-1)", 1, _MD_CONTACT_MES_NOVALIDEMAIL);

Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php	2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php	2013-10-07 20:46:22 UTC (rev 12161)
@@ -32,11 +32,11 @@
 define('_MI_CONTACT_FORM_ADDRESS_DESC', "");
 define('_MI_CONTACT_FORM_DEPT', "Select Departments");
 define('_MI_CONTACT_FORM_DEPT_DESC', "");
-define('_MI_CONTACT_FORM_CAPTCHA', "Use Captcha");
-define('_MI_CONTACT_FORM_CAPTCHA_DESC', "");
+define('_MI_CONTACT_FORM_CAPTCHA', "Use captcha in submit form?");
+define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use captcha in the submit form.<br />Default: <em>Yes</em>");
 define('_MI_CONTACT_DEPT', "Departments");
 define('_MI_CONTACT_DEPT_DESC', "Departments allow you to define a department/email combination.  Users selecting<br />"
-    . "from a defined department will have their contact information sent to the corresponding<br />" 
+    . "from a defined department will have their contact information sent to the corresponding<br />"
     . "email address you define.<br /><br />"
     . "Define each department/email as follows:<br /><br />"
     . "dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"

Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php	2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/xoops_version.php	2013-10-07 20:46:22 UTC (rev 12161)
@@ -85,6 +85,15 @@
 );
 
 $modversion['config'][] = array(
+    'name'        => 'captcha',
+    'title'       => '_MI_CONTACT_FORM_CAPTCHA',
+    'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
+    'formtype'    => 'yesno',
+    'valuetype'   => 'int',
+    'default'     => 1
+);
+
+$modversion['config'][] = array(
     'name'        => 'form_url',
     'title'       => '_MI_CONTACT_FORM_URL',
     'description' => '_MI_CONTACT_FORM_URL_DESC',