contactsformcaptcha - Version 1.4.0

Version Notes

Implemented reCaptcha V2.0

Release Info

Developer	Magento Core Team
Extension	contactsformcaptcha
Version	1.4.0
Comparing to
See all releases

Code changes from version 1.3.1 to 1.4.0

Files changed (10) hide show

app/code/community/OlegKoval/ContactsFormCaptcha/Model/System/Config/Source/Dropdown/Lang.php +5 -1
app/code/community/OlegKoval/ContactsFormCaptcha/Model/System/Config/Source/Dropdown/Theme.php +9 -13
app/code/community/OlegKoval/ContactsFormCaptcha/controllers/IndexController.php +43 -22
app/code/community/OlegKoval/ContactsFormCaptcha/etc/config.xml +2 -2
app/code/community/OlegKoval/ContactsFormCaptcha/etc/system.xml +1 -1
app/design/frontend/base/default/layout/contactsformcaptcha.xml +1 -1
app/design/frontend/base/default/template/contactsformcaptcha/form.phtml +9 -7
app/etc/modules/OlegKoval_ContactsFormCaptcha.xml +1 -1
lib/reCaptcha/recaptchalib.php +0 -276
package.xml +5 -5

app/code/community/OlegKoval/ContactsFormCaptcha/Model/System/Config/Source/Dropdown/Lang.php CHANGED Viewed

	@@ -4,10 +4,14 @@
4	*
5	* @category OlegKoval
6	* @package OlegKoval_ContactsFormCaptcha
7	- * @copyright Copyright (c) 2012 Oleg Koval
8	* @author Oleg Koval <oleh.koval@gmail.com>
9	*/
10	class OlegKoval_ContactsFormCaptcha_Model_System_Config_Source_Dropdown_Lang {




11	public function toOptionArray() {
12	return array(
13	array(


4	*
5	* @category OlegKoval
6	* @package OlegKoval_ContactsFormCaptcha
7	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
8	* @author Oleg Koval <oleh.koval@gmail.com>
9	*/
10	class OlegKoval_ContactsFormCaptcha_Model_System_Config_Source_Dropdown_Lang {
11	+ /**
12	+ * Generate lang options array
13	+ * @return array
14	+ */
15	public function toOptionArray() {
16	return array(
17	array(

app/code/community/OlegKoval/ContactsFormCaptcha/Model/System/Config/Source/Dropdown/Theme.php CHANGED Viewed

	@@ -4,27 +4,23 @@
4	*
5	* @category OlegKoval
6	* @package OlegKoval_ContactsFormCaptcha
7	- * @copyright Copyright (c) 2012 Oleg Koval
8	* @author Oleg Koval <oleh.koval@gmail.com>
9	*/
10	class OlegKoval_ContactsFormCaptcha_Model_System_Config_Source_Dropdown_Theme {




11	public function toOptionArray() {
12	return array(
13	array(
14	- 'value' => '~~red~~',
15	- 'label' => '~~Red~~ (default)',
16	),
17	array(
18	- 'value' => '~~white~~',
19	- 'label' => '~~White~~',
20	- ),
21	- array(
22	- 'value' => 'blackglass',
23	- 'label' => 'Blackglass',
24	- ),
25	- array(
26	- 'value' => 'clean',
27	- 'label' => 'Clean',
28	),
29	);
30	}


4	*
5	* @category OlegKoval
6	* @package OlegKoval_ContactsFormCaptcha
7	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
8	* @author Oleg Koval <oleh.koval@gmail.com>
9	*/
10	class OlegKoval_ContactsFormCaptcha_Model_System_Config_Source_Dropdown_Theme {
11	+ /**
12	+ * Generate theme options array
13	+ * @return array
14	+ */
15	public function toOptionArray() {
16	return array(
17	array(
18	+ 'value' => 'light',
19	+ 'label' => 'Light (default)',
20	),
21	array(
22	+ 'value' => 'dark',
23	+ 'label' => 'Dark',








24	),
25	);
26	}

app/code/community/OlegKoval/ContactsFormCaptcha/controllers/IndexController.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* @category OlegKoval
6	* @package OlegKoval_ContactsFormCaptcha
7	- * @copyright Copyright (c) 2012 Oleg Koval
8	* @author Oleg Koval <oleh.koval@gmail.com>
9	*/
10	//include controller to override it
	@@ -18,7 +18,7 @@ class OlegKoval_ContactsFormCaptcha_IndexController extends Mage_Contacts_IndexC
18	const XML_PATH_CFC_LANG = 'contacts/olegkoval_contactsformcaptcha/lang';
19
20	/**
21	- * ~~Check~~ ~~if "Contacts Form Captcha" is enabled~~
22	*/
23	public function preDispatch() {
24	parent::preDispatch();
	@@ -33,17 +33,13 @@ class OlegKoval_ContactsFormCaptcha_IndexController extends Mage_Contacts_IndexC
33	$this->getLayout()->getBlock('contactForm')->setFormAction(Mage::getUrl('//post'));
34
35	if (Mage::getStoreConfigFlag(self::XML_PATH_CFC_ENABLED)) {
36	- //include reCaptcha library
37	- require_once(Mage::getBaseDir('lib') . DS .'reCaptcha'. DS .'recaptchalib.php');
38	-
39	//create captcha html-code
40	- $~~publickey~~ = Mage::getStoreConfig(self::XML_PATH_CFC_PUBLIC_KEY);
41	- $captcha_code = recaptcha_get_html($publickey, null, Mage::app()->getStore()->isCurrentlySecure());
42
43	//get reCaptcha theme name
44	$theme = Mage::getStoreConfig(self::XML_PATH_CFC_THEME);
45	- if (strlen($theme) == 0 \|\| !in_array($theme, array('~~red~~', '~~white~~'~~, 'blackglass', 'clean'~~))) {
46	- $theme = '~~red~~';
47	}
48
49	//get reCaptcha lang name
	@@ -51,10 +47,8 @@ class OlegKoval_ContactsFormCaptcha_IndexController extends Mage_Contacts_IndexC
51	if (strlen($lang) == 0 \|\| !in_array($lang, array('en', 'nl', 'fr', 'de', 'pt', 'ru', 'es', 'tr'))) {
52	$lang = 'en';
53	}
54	- //small hack for language feature - because it's not working as described in documentation
55	- $captcha_code = str_replace('?k=', '?hl='. $lang .'&k=', $captcha_code);
56
57	- $this->getLayout()->getBlock('contactForm')->~~setCaptchaCode~~($~~captcha_code~~)
58	->setCaptchaTheme($theme)
59	->setCaptchaLang($lang);
60	}
	@@ -66,7 +60,6 @@ class OlegKoval_ContactsFormCaptcha_IndexController extends Mage_Contacts_IndexC
66
67	/**
68	* Handle post request of Contact form
69	- * @return [type] [description]
70	*/
71	public function postAction() {
72	if (Mage::getStoreConfigFlag(self::XML_PATH_CFC_ENABLED)) {
	@@ -77,15 +70,7 @@ class OlegKoval_ContactsFormCaptcha_IndexController extends Mage_Contacts_IndexC
77	Mage::getSingleton('core/session')->setData('contactForm', $formData);
78
79	if ($post) {
80	- ~~//include~~ ~~reCaptcha~~ ~~library~~
81	- require_once(Mage::getBaseDir('lib') . DS .'reCaptcha'. DS .'recaptchalib.php');
82	-
83	- //validate captcha
84	- $privatekey = Mage::getStoreConfig(self::XML_PATH_CFC_PRIVATE_KEY);
85	- $remote_addr = $this->getRequest()->getServer('REMOTE_ADDR');
86	- $captcha = recaptcha_check_answer($privatekey, $remote_addr, $post["recaptcha_challenge_field"], $post["recaptcha_response_field"]);
87	-
88	- if (!$captcha->is_valid) {
89	throw new Exception($this->__("The reCAPTCHA wasn't entered correctly. Go back and try it again."), 1);
90	}
91
	@@ -107,4 +92,40 @@ class OlegKoval_ContactsFormCaptcha_IndexController extends Mage_Contacts_IndexC
107	//everything is OK - call parent action
108	parent::postAction();
109	}




































110	}


4	*
5	* @category OlegKoval
6	* @package OlegKoval_ContactsFormCaptcha
7	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
8	* @author Oleg Koval <oleh.koval@gmail.com>
9	*/
10	//include controller to override it

18	const XML_PATH_CFC_LANG = 'contacts/olegkoval_contactsformcaptcha/lang';
19
20	/**
21	+ * @see parent::preDispatch
22	*/
23	public function preDispatch() {
24	parent::preDispatch();

33	$this->getLayout()->getBlock('contactForm')->setFormAction(Mage::getUrl('//post'));
34
35	if (Mage::getStoreConfigFlag(self::XML_PATH_CFC_ENABLED)) {



36	//create captcha html-code
37	+ $siteKey = Mage::getStoreConfig(self::XML_PATH_CFC_PUBLIC_KEY);

38
39	//get reCaptcha theme name
40	$theme = Mage::getStoreConfig(self::XML_PATH_CFC_THEME);
41	+ if (strlen($theme) == 0 \|\| !in_array($theme, array('dark', 'light'))) {
42	+ $theme = 'light';
43	}
44
45	//get reCaptcha lang name

47	if (strlen($lang) == 0 \|\| !in_array($lang, array('en', 'nl', 'fr', 'de', 'pt', 'ru', 'es', 'tr'))) {
48	$lang = 'en';
49	}


50
51	+ $this->getLayout()->getBlock('contactForm')->setSiteKey($siteKey)
52	->setCaptchaTheme($theme)
53	->setCaptchaLang($lang);
54	}

60
61	/**
62	* Handle post request of Contact form

63	*/
64	public function postAction() {
65	if (Mage::getStoreConfigFlag(self::XML_PATH_CFC_ENABLED)) {

70	Mage::getSingleton('core/session')->setData('contactForm', $formData);
71
72	if ($post) {
73	+ if (!isset($post['g-recaptcha-response']) \|\| !$this->isCaptchaValid($post['g-recaptcha-response'])) {








74	throw new Exception($this->__("The reCAPTCHA wasn't entered correctly. Go back and try it again."), 1);
75	}
76

92	//everything is OK - call parent action
93	parent::postAction();
94	}
95	+
96	+ /**
97	+ * Check if captcha is valid
98	+ * @param string $captchaResponse
99	+ * @return boolean
100	+ */
101	+ private function isCaptchaValid($captchaResponse) {
102	+ $result = false;
103	+
104	+ $params = array(
105	+ 'secret' => Mage::getStoreConfig(self::XML_PATH_CFC_PRIVATE_KEY),
106	+ 'response' => $captchaResponse
107	+ );
108	+
109	+ $ch = curl_init('https://www.google.com/recaptcha/api/siteverify');
110	+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1) ;
111	+ curl_setopt($ch, CURLOPT_HEADER, 0);
112	+ curl_setopt($ch, CURLOPT_POST, 1);
113	+ curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params));
114	+ curl_setopt($ch, CURLOPT_VERBOSE, 1);
115	+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
116	+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
117	+ curl_setopt($ch, CURLOPT_TIMEOUT, 30);
118	+ $requestResult = trim(curl_exec($ch));
119	+ curl_close($ch);
120	+
121	+ if (is_array(json_decode($requestResult, true))) {
122	+ $response = json_decode($requestResult, true);
123	+
124	+ if (isset($response['success']) && $response['success'] === true) {
125	+ $result = true;
126	+ }
127	+ }
128	+
129	+ return $result;
130	+ }
131	}

app/code/community/OlegKoval/ContactsFormCaptcha/etc/config.xml CHANGED Viewed

	@@ -5,14 +5,14 @@
5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	- * @copyright Copyright (c) 2012 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->
12	<config>
13	<modules>
14	<OlegKoval_ContactsFormCaptcha>
15	- <version>1.3.1</version>
16	<depends>
17	<Mage_Contacts/>
18	</depends>


5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->
12	<config>
13	<modules>
14	<OlegKoval_ContactsFormCaptcha>
15	+ <version>1.4.0</version>
16	<depends>
17	<Mage_Contacts/>
18	</depends>

app/code/community/OlegKoval/ContactsFormCaptcha/etc/system.xml CHANGED Viewed

	@@ -5,7 +5,7 @@
5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	- * @copyright Copyright (c) 2012 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->


5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->

app/design/frontend/base/default/layout/contactsformcaptcha.xml CHANGED Viewed

	@@ -5,7 +5,7 @@
5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	- * @copyright Copyright (c) 2012 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->


5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->

app/design/frontend/base/default/template/contactsformcaptcha/form.phtml CHANGED Viewed

	@@ -33,13 +33,15 @@
33	<div class="page-title">
34	<h1><?php echo Mage::helper('contacts')->__('Contact Us') ?></h1>
35	</div>

36	<script type="text/javascript">
37	- ~~//<![CDATA[~~
38	- ~~var~~ ~~RecaptchaOptions =~~ {
39	- ~~theme~~ : '<?php echo $this->~~getCaptchaTheme~~(); ?>',
40	- ~~lang~~ : '<?php echo $this->~~getCaptchaLang~~(); ?>',
41	- };
42	- ~~//]]>~~

43	</script>
44	<form action="<?php echo $this->getFormAction(); ?>" id="contactForm" method="post">
45	<div class="fieldset">
	@@ -73,7 +75,7 @@
73	</li>
74	<li class="wide">
75	<div class="input-box">
76	- ~~<?php~~ ~~echo $this->getCaptchaCode(); ?>~~
77	</div>
78	</li>
79	</ul>


33	<div class="page-title">
34	<h1><?php echo Mage::helper('contacts')->__('Contact Us') ?></h1>
35	</div>
36	+ <script src="https://www.google.com/recaptcha/api.js?onload=renderReCaptcha&render=explicit" async defer></script>
37	<script type="text/javascript">
38	+ function renderReCaptcha() {
39	+ grecaptcha.render('re_captcha', {
40	+ sitekey: '<?php echo $this->getSiteKey(); ?>',
41	+ theme: '<?php echo $this->getCaptchaTheme(); ?>',
42	+ lang: '<?php echo $this->getCaptchaLang(); ?>'
43	+ });
44	+ }
45	</script>
46	<form action="<?php echo $this->getFormAction(); ?>" id="contactForm" method="post">
47	<div class="fieldset">

75	</li>
76	<li class="wide">
77	<div class="input-box">
78	+ <div id="re_captcha"></div>
79	</div>
80	</li>
81	</ul>

app/etc/modules/OlegKoval_ContactsFormCaptcha.xml CHANGED Viewed

	@@ -5,7 +5,7 @@
5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	- * @copyright Copyright (c) 2012 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->


5	*
6	* @category OlegKoval
7	* @package OlegKoval_ContactsFormCaptcha
8	+ * @copyright Copyright (c) 2012 - 2016 Oleg Koval
9	* @author Oleg Koval <oleh.koval@gmail.com>
10	*/
11	-->

lib/reCaptcha/recaptchalib.php DELETED Viewed

@@ -1,276 +0,0 @@
-            -
            <?php
-            -
            /*
-            -
             * This is a PHP library that handles calling reCAPTCHA.
-            -
             *    - Documentation and latest version
-            -
             *          http://recaptcha.net/plugins/php/
-            -
             *    - Get a reCAPTCHA API Key
-            -
             *          https://www.google.com/recaptcha/admin/create
-            -
             *    - Discussion group
-            -
             *          http://groups.google.com/group/recaptcha
-            -
             *
-            -
             * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
-            -
             * AUTHORS:
-            -
             *   Mike Crawford
-            -
             *   Ben Maurer
-            -
             *
-            -
             * Permission is hereby granted, free of charge, to any person obtaining a copy
-            -
             * of this software and associated documentation files (the "Software"), to deal
-            -
             * in the Software without restriction, including without limitation the rights
-            -
             * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-            -
             * copies of the Software, and to permit persons to whom the Software is
-            -
             * furnished to do so, subject to the following conditions:
-            -
             *
-            -
             * The above copyright notice and this permission notice shall be included in
-            -
             * all copies or substantial portions of the Software.
-            -
             *
-            -
             * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-            -
             * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-            -
             * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-            -
             * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-            -
             * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-            -
             * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-            -
             * THE SOFTWARE.
-            -
             */
-            -
-            -
            /**
-            -
             * The reCAPTCHA server URL's
-            -
             */
-            -
            define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
-            -
            define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-            -
            define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
-            -
-            -
            /**
-            -
             * Encodes the given data into a query string format
-            -
             * @param $data - array of string elements to be encoded
-            -
             * @return string - encoded request
-            -
             */
-            -
            function _recaptcha_qsencode ($data) {
-            -
                    $req = "";
-            -
                    foreach ( $data as $key => $value )
-            -
                            $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-            -
-            -
                    // Cut the last '&'
-            -
                    $req=substr($req,0,strlen($req)-1);
-            -
                    return $req;
-            -
            }
-            -
-            -
-            -
-            -
            /**
-            -
             * Submits an HTTP POST to a reCAPTCHA server
-            -
             * @param string $host
-            -
             * @param string $path
-            -
             * @param array $data
-            -
             * @param int port
-            -
             * @return array response
-            -
             */
-            -
            function _recaptcha_http_post($host, $path, $data, $port = 80) {
-            -
-            -
                    $req = _recaptcha_qsencode ($data);
-            -
-            -
                    $http_request  = "POST $path HTTP/1.0\r\n";
-            -
                    $http_request .= "Host: $host\r\n";
-            -
                    $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-            -
                    $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-            -
                    $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-            -
                    $http_request .= "\r\n";
-            -
                    $http_request .= $req;
-            -
-            -
                    $response = '';
-            -
                    if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-            -
                            die ('Could not open socket');
-            -
                    }
-            -
-            -
                    fwrite($fs, $http_request);
-            -
-            -
                    while ( !feof($fs) )
-            -
                            $response .= fgets($fs, 1160); // One TCP-IP packet
-            -
                    fclose($fs);
-            -
                    $response = explode("\r\n\r\n", $response, 2);
-            -
-            -
                    return $response;
-            -
            }
-            -
-            -
-            -
-            -
            /**
-            -
             * Gets the challenge HTML (javascript and non-javascript version).
-            -
             * This is called from the browser, and the resulting reCAPTCHA HTML widget
-            -
             * is embedded within the HTML form it was called from.
-            -
             * @param string $pubkey A public key for reCAPTCHA
-            -
             * @param string $error The error given by reCAPTCHA (optional, default is null)
-            -
             * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-            -
             * @return string - The HTML to be embedded in the user's form.
-            -
             */
-            -
            function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
-            -
            {
-            -
            	if ($pubkey == null || $pubkey == '') {
-            -
            		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-            -
            	}
-            -
-            -
            	if ($use_ssl) {
-            -
                            $server = RECAPTCHA_API_SECURE_SERVER;
-            -
                    } else {
-            -
                            $server = RECAPTCHA_API_SERVER;
-            -
                    }
-            -
-            -
                    $errorpart = "";
-            -
                    if ($error) {
-            -
                       $errorpart = "&amp;error=" . $error;
-            -
                    }
-            -
                    return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-            -
-            -
            	<noscript>
-            -
              		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
-            -
              		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-            -
              		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-            -
            	</noscript>';
-            -
            }
-            -
-            -
-            -
-            -
-            -
            /**
-            -
             * A ReCaptchaResponse is returned from recaptcha_check_answer()
-            -
             */
-            -
            class ReCaptchaResponse {
-            -
                    var $is_valid;
-            -
                    var $error;
-            -
            }
-            -
-            -
-            -
            /**
-            -
              * Calls an HTTP POST function to verify if the user's guess was correct
-            -
              * @param string $privkey
-            -
              * @param string $remoteip
-            -
              * @param string $challenge
-            -
              * @param string $response
-            -
              * @param array $extra_params an array of extra variables to post to the server
-            -
              * @return ReCaptchaResponse
-            -
              */
-            -
            function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
-            -
            {
-            -
            	if ($privkey == null || $privkey == '') {
-            -
            		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-            -
            	}
-            -
-            -
            	if ($remoteip == null || $remoteip == '') {
-            -
            		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-            -
            	}
-            -
-            -
-            -
-            -
                    //discard spam submissions
-            -
                    if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-            -
                            $recaptcha_response = new ReCaptchaResponse();
-            -
                            $recaptcha_response->is_valid = false;
-            -
                            $recaptcha_response->error = 'incorrect-captcha-sol';
-            -
                            return $recaptcha_response;
-            -
                    }
-            -
-            -
                    $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-            -
                                                      array (
-            -
                                                             'privatekey' => $privkey,
-            -
                                                             'remoteip' => $remoteip,
-            -
                                                             'challenge' => $challenge,
-            -
                                                             'response' => $response
-            -
                                                             ) + $extra_params
-            -
                                                      );
-            -
-            -
                    $answers = explode ("\n", $response [1]);
-            -
                    $recaptcha_response = new ReCaptchaResponse();
-            -
-            -
                    if (trim ($answers [0]) == 'true') {
-            -
                            $recaptcha_response->is_valid = true;
-            -
                    }
-            -
                    else {
-            -
                            $recaptcha_response->is_valid = false;
-            -
                            $recaptcha_response->error = $answers [1];
-            -
                    }
-            -
                    return $recaptcha_response;
-            -
-            -
            }
-            -
-            -
            /**
-            -
             * gets a URL where the user can sign up for reCAPTCHA. If your application
-            -
             * has a configuration page where you enter a key, you should provide a link
-            -
             * using this function.
-            -
             * @param string $domain The domain where the page is hosted
-            -
             * @param string $appname The name of your application
-            -
             */
-            -
            function recaptcha_get_signup_url ($domain = null, $appname = null) {
-            -
            	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
-            -
            }
-            -
-            -
            function _recaptcha_aes_pad($val) {
-            -
            	$block_size = 16;
-            -
            	$numpad = $block_size - (strlen ($val) % $block_size);
-            -
            	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
-            -
            }
-            -
-            -
            /* Mailhide related code */
-            -
-            -
            function _recaptcha_aes_encrypt($val,$ky) {
-            -
            	if (! function_exists ("mcrypt_encrypt")) {
-            -
            		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-            -
            	}
-            -
            	$mode=MCRYPT_MODE_CBC;
-            -
            	$enc=MCRYPT_RIJNDAEL_128;
-            -
            	$val=_recaptcha_aes_pad($val);
-            -
            	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-            -
            }
-            -
-            -
-            -
            function _recaptcha_mailhide_urlbase64 ($x) {
-            -
            	return strtr(base64_encode ($x), '+/', '-_');
-            -
            }
-            -
-            -
            /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-            -
            function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-            -
            	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-            -
            		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-            -
            		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
-            -
            	}
-            -
-            -
-            -
            	$ky = pack('H*', $privkey);
-            -
            	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-            -
-            -
            	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
-            -
            }
-            -
-            -
            /**
-            -
             * gets the parts of the email to expose to the user.
-            -
             * eg, given johndoe@example,com return ["john", "example.com"].
-            -
             * the email is then displayed as john...@example.com
-            -
             */
-            -
            function _recaptcha_mailhide_email_parts ($email) {
-            -
            	$arr = preg_split("/@/", $email );
-            -
-            -
            	if (strlen ($arr[0]) <= 4) {
-            -
            		$arr[0] = substr ($arr[0], 0, 1);
-            -
            	} else if (strlen ($arr[0]) <= 6) {
-            -
            		$arr[0] = substr ($arr[0], 0, 3);
-            -
            	} else {
-            -
            		$arr[0] = substr ($arr[0], 0, 4);
-            -
            	}
-            -
            	return $arr;
-            -
            }
-            -
-            -
            /**
-            -
             * Gets html to display an email address given a public an private key.
-            -
             * to get a key, go to:
-            -
             *
-            -
             * http://www.google.com/recaptcha/mailhide/apikey
-            -
             */
-            -
            function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-            -
            	$emailparts = _recaptcha_mailhide_email_parts ($email);
-            -
            	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-            -
-            -
            	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-            -
            		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
-            -
-            -
            }
-            -
-            -
-            -
            ?>

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>contactsformcaptcha</name>
4	- <version>1.3.1</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/OSL-3.0">OSL v3.0</license>
7	<channel>community</channel>
	@@ -12,11 +12,11 @@
12
13
14	This extension uses reCaptcha library (http://www.google.com/recaptcha).</description>
15	- <notes>~~Added~~ ~~autodetecting~~ ~~of secure mode~~. ~~Modified labels of config options.</~~notes>
16	<authors><author><name>Oleg Koval</name><user>auto-converted</user><email>oleh.koval@gmail.com</email></author></authors>
17	- <date>2016-01-09</date>
18	- <time>14:46:57</time>
19	- <contents><target name="magecommunity"><dir name="OlegKoval"><dir name="ContactsFormCaptcha"><dir name="Model"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Dropdown"><file name="Lang.php" hash="~~c3b3814ccfc3f97fb8807f0d4ad69d8c~~"/><file name="Theme.php" hash="~~c0a7eb1ad6e2157b5f822d0a5d30022c~~"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="~~20cd5985f31d0c960a10ed2581350368~~"/></dir><dir name="etc"><file name="config.xml" hash="~~1d43e3e113e335f3aed32071fd73b0e3~~"/><file name="system.xml" hash="~~8dfefc416bfb626600a79115dfa5ddd6~~"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="OlegKoval_ContactsFormCaptcha.xml" hash="~~9b7cbc1587fc43d6a0cd1106bc19a4fc~~"/></dir></target><target name="~~magelib"><dir name="reCaptcha"><file name="recaptchalib.php" hash="f80a9f01727de68aba8e98f1e37345a9"/></dir></target><target name="~~magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="contactsformcaptcha.xml" hash="~~c51cd3c07d757ee1985653544fffb2fd~~"/></dir><dir name="template"><dir name="contactsformcaptcha"><file name="form.phtml" hash="~~bb89546be7a1730937089f1769438ffc~~"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="OlegKoval_ContactsFormCaptcha.csv" hash="5e430d77c352109bf67305e56b4a3845"/></dir></target></contents>
20	<compatible/>
21	<dependencies/>
22	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>contactsformcaptcha</name>
4	+ <version>1.4.0</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/OSL-3.0">OSL v3.0</license>
7	<channel>community</channel>

12
13
14	This extension uses reCaptcha library (http://www.google.com/recaptcha).</description>
15	+ <notes>Implemented reCaptcha V2.0</notes>
16	<authors><author><name>Oleg Koval</name><user>auto-converted</user><email>oleh.koval@gmail.com</email></author></authors>
17	+ <date>2016-04-05</date>
18	+ <time>11:17:40</time>
19	+ <contents><target name="magecommunity"><dir name="OlegKoval"><dir name="ContactsFormCaptcha"><dir name="Model"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Dropdown"><file name="Lang.php" hash="03f3c49ec2dcaccaef8af691d717c6e0"/><file name="Theme.php" hash="e378be865954e4e23047b576618d1e66"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="8ccb4c819b849e8d3babd0ebf0469e29"/></dir><dir name="etc"><file name="config.xml" hash="f62eed1bc71abbf55f5046d0eb49ef1b"/><file name="system.xml" hash="1b51861c32ee644f56f6bb2d0649c8ee"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="OlegKoval_ContactsFormCaptcha.xml" hash="aa8aecf0aae35f405c3908112baa0eac"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="contactsformcaptcha.xml" hash="c5fb2a235c46fe4946a7fbdf81eaa1b9"/></dir><dir name="template"><dir name="contactsformcaptcha"><file name="form.phtml" hash="c41688f8b47d23cccb6e783d753d63eb"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="OlegKoval_ContactsFormCaptcha.csv" hash="5e430d77c352109bf67305e56b4a3845"/></dir></target></contents>
20	<compatible/>
21	<dependencies/>
22	</package>