Add in reviews captcha

ProxiBlue · Jul 16, 2015 · de9268a · de9268a
1 parent 5b6ebff
commit de9268a
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 59 deletions.
diff --git a/app/code/community/ProxiBlue/ReCaptcha/Model/Observer.php b/app/code/community/ProxiBlue/ReCaptcha/Model/Observer.php
@@ -54,6 +54,30 @@ public function checkContact($observer)
         return $this;
     }
 
+    /**
+     * Check Captcha On Forgot Password Page
+     *
+     * @param Varien_Event_Observer $observer
+     * @return Mage_Captcha_Model_Observer
+     */
+    public function checkReview($observer)
+    {
+        $formId = 'user_review';
+        $captchaModel = Mage::helper('captcha')->getCaptcha($formId);
+        if ($captchaModel->isRequired()) {
+            $controller = $observer->getControllerAction();
+            if (!$captchaModel->isCorrect($this->_getCaptchaString($controller->getRequest(), $formId))) {
+                Mage::getSingleton('customer/session')->addError(Mage::helper('captcha')->__('Incorrect CAPTCHA.'));
+                //$controller->setFlag('', Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH, true);
+                //$refererUrl = $this->_getRefererUrl();
+                //$controller->getResponse()->setRedirect($refererUrl);
+                //invalidate the formkey, whoich will force the controller to redirect back to referer
+                $controller->getRequest()->setParam('form_key', 'Incorrect CAPTCHA.');
+            }
+        }
+        return $this;
+    }
+
     /**
      * Get Captcha String
      *
@@ -67,4 +91,28 @@ protected function _getCaptchaString($request, $formId)
         return $captchaParams[$formId];
     }
 
+    /**
+     * Identify referer url via all accepted methods (HTTP_REFERER, regular or base64-encoded request param)
+     *
+     * @return string
+     */
+    protected function _getRefererUrl($controller)
+    {
+        $refererUrl = $controller->getRequest()->getServer('HTTP_REFERER');
+        if ($url = $controller->getRequest()->getParam(Mage_Core_Controller_Varien_Action::PARAM_NAME_REFERER_URL)) {
+            $refererUrl = $url;
+        }
+        if ($url = $controller->getRequest()->getParam(Mage_Core_Controller_Varien_Action::PARAM_NAME_BASE64_URL)) {
+            $refererUrl = Mage::helper('core')->urlDecodeAndEscape($url);
+        }
+        if ($url = $controller->getRequest()->getParam(Mage_Core_Controller_Varien_Action::PARAM_NAME_URL_ENCODED)) {
+            $refererUrl = Mage::helper('core')->urlDecodeAndEscape($url);
+        }
+
+        if (!$this->_isUrlInternal($refererUrl)) {
+            $refererUrl = Mage::app()->getStore()->getBaseUrl();
+        }
+        return $refererUrl;
+    }
+
 }
diff --git a/app/code/community/ProxiBlue/ReCaptcha/etc/config.xml b/app/code/community/ProxiBlue/ReCaptcha/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <ProxiBlue_ReCaptcha>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
             <depends>
                 <Mage_Captcha/>
             </depends>
@@ -38,6 +38,14 @@
                     </captcha>
                 </observers>
             </controller_action_predispatch_contacts_index_post>
+            <controller_action_predispatch_review_product_post>
+                <observers>
+                    <captcha>
+                        <class>proxiblue_recaptcha/observer</class>
+                        <method>checkReview</method>
+                    </captcha>
+                </observers>
+            </controller_action_predispatch_review_product_post>
         </events>
     </global>
     <frontend>
@@ -72,6 +80,9 @@
                     <user_contact>
                         <label>Contact</label>
                     </user_contact>
+                    <user_review>
+                        <label>Reviews</label>
+                    </user_review>
                 </areas>
             </frontend>
         </captcha>

diff --git a/app/code/community/ProxiBlue/ReCaptcha/etc/system.xml b/app/code/community/ProxiBlue/ReCaptcha/etc/system.xml
@@ -1,30 +1,4 @@
 <?xml version="1.0"?>
-<!--
-/**
- * Magento Enterprise Edition
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Magento Enterprise Edition License
- * that is bundled with this package in the file LICENSE_EE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://www.magentocommerce.com/license/enterprise-edition
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Mage
- * @package     Mage_Captcha
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://www.magentocommerce.com/license/enterprise-edition
- */
--->
 <config>
 	<sections>
 		<admin>

diff --git a/app/design/frontend/base/default/layout/proxiblue_recaptcha.xml b/app/design/frontend/base/default/layout/proxiblue_recaptcha.xml
@@ -1,40 +1,8 @@
 <?xml version="1.0"?>
-<!--
-/**
- * Magento Enterprise Edition
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Magento Enterprise Edition License
- * that is bundled with this package in the file LICENSE_EE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://www.magentocommerce.com/license/enterprise-edition
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://www.magentocommerce.com/license/enterprise-edition
- */
-
--->
 <layout version="0.1.0">
     <contacts_index_index>
         <reference name="contactForm">
             <block type="captcha/captcha" name="recaptcha">
-                <reference name="head">
-                    <action method="addJs">
-                        <file>mage/captcha.js</file>
-                    </action>
-                </reference>
                 <action method="setFormId">
                     <formId>user_contact</formId>
                 </action>
@@ -47,4 +15,19 @@
             </block>
         </reference>
     </contacts_index_index>
+    <review_product_list>
+        <reference name="product.review.form">
+            <block type="captcha/captcha" name="recaptcha">
+                <action method="setFormId">
+                    <formId>user_review</formId>
+                </action>
+                <action method="setImgWidth">
+                    <width>230</width>
+                </action>
+                <action method="setImgHeight">
+                    <width>50</width>
+                </action>
+            </block>
+        </reference>
+    </review_product_list>
 </layout>