diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Service/ReCaptcha.php
--- a/web/lib/Zend/Service/ReCaptcha.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Service/ReCaptcha.php Thu Mar 21 19:50:53 2013 +0100
@@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Service
* @subpackage ReCaptcha
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -34,9 +34,9 @@
* @category Zend
* @package Zend_Service
* @subpackage ReCaptcha
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: ReCaptcha.php 25153 2012-11-28 11:56:23Z cogo $
*/
class Zend_Service_ReCaptcha extends Zend_Service_Abstract
{
@@ -45,21 +45,21 @@
*
* @var string
*/
- const API_SERVER = 'http://api.recaptcha.net';
+ const API_SERVER = 'http://www.google.com/recaptcha/api';
/**
* URI to the secure API
*
* @var string
*/
- const API_SECURE_SERVER = 'https://api-secure.recaptcha.net';
+ const API_SECURE_SERVER = 'https://www.google.com/recaptcha/api';
/**
* URI to the verify server
*
* @var string
*/
- const VERIFY_SERVER = 'http://api-verify.recaptcha.net/verify';
+ const VERIFY_SERVER = 'http://www.google.com/recaptcha/api/verify';
/**
* Public key used when displaying the captcha
@@ -373,10 +373,11 @@
*
* This method uses the public key to fetch a recaptcha form.
*
+ * @param null|string $name Base name for recaptcha form elements
* @return string
* @throws Zend_Service_ReCaptcha_Exception
*/
- public function getHtml()
+ public function getHtml($name = null)
{
if ($this->_publicKey === null) {
/** @see Zend_Service_ReCaptcha_Exception */
@@ -415,6 +416,12 @@
SCRIPT;
}
+ $challengeField = 'recaptcha_challenge_field';
+ $responseField = 'recaptcha_response_field';
+ if (!empty($name)) {
+ $challengeField = $name . '[' . $challengeField . ']';
+ $responseField = $name . '[' . $responseField . ']';
+ }
$return = $reCaptchaOptions;
$return .= <<
{$htmlBreak}
-
-
HTML;
@@ -460,21 +467,9 @@
throw new Zend_Service_ReCaptcha_Exception('Missing ip address');
}
- if (empty($challengeField)) {
- /** @see Zend_Service_ReCaptcha_Exception */
- require_once 'Zend/Service/ReCaptcha/Exception.php';
- throw new Zend_Service_ReCaptcha_Exception('Missing challenge field');
- }
-
- if (empty($responseField)) {
- /** @see Zend_Service_ReCaptcha_Exception */
- require_once 'Zend/Service/ReCaptcha/Exception.php';
-
- throw new Zend_Service_ReCaptcha_Exception('Missing response field');
- }
-
/* Fetch an instance of the http client */
$httpClient = self::getHttpClient();
+ $httpClient->resetParameters(true);
$postParams = array('privatekey' => $this->_privateKey,
'remoteip' => $this->_ip,