Changes for recaptcha

Author: Nabeel Shahzad

.gitignore

@@ -7,3 +7,4 @@ ed
 phpvms.iml
 core/local.config.php
 *.iml
+core/cache/

core/app.config.php

@@ -222,10 +222,12 @@
 Config::Set('VACENTRAL_NEWS_FEED', 'http://feeds.feedburner.com/vacentral');
 Config::Set('GEONAME_API_SERVER', 'http://ws.geonames.org');
 
-/* Keys for recaptcha, you can change these if you want to your own but it's
-	a global key so it should just work */
-Config::Set('RECAPTCHA_PUBLIC_KEY', '6LcklAsAAAAAAJqmghmMPOACeJrAxW3sJulSboxx');
-Config::Set('RECAPTCHA_PRIVATE_KEY', '6LcklAsAAAAAAMeQy5ZBoDu8JOMTP-UL7ek1GedO');
+# Add to the end of local.config.php
+# You need to get the keys from here: https://www.google.com/recaptcha/admin
+# Put the "Site Key" in RECAPTCHA_PUBLIC_KEY
+# Put the "Secret Key" in RECAPTCHA_PRIVATE_KEY
+Config::Set('RECAPTCHA_PUBLIC_KEY', '');
+Config::Set('RECAPTCHA_PRIVATE_KEY', '');
 
 /*	Whether you have the /admin/maintenance.php script added into cron.
 	If you do, set this to true. This saves many DB calls since phpVMS will

core/bootstrap.inc.php

@@ -16,6 +16,8 @@
  * @license http://creativecommons.org/licenses/by-nc-sa/3.0/
  */
 
+require_once CORE_PATH.'/lib/recaptcha/autoload.php';
+
 function pre_module_load()
 {	
 	if(is_dir(CORE_PATH.'/local.config.php'))
@@ -150,4 +152,4 @@ function fileurl($path)
 function html_url($title, $url)
 {
 	return '<a href="'.url($url).'" >'.$title.'</a>';
-}
+}

core/modules/Registration/Registration.php

@@ -31,8 +31,6 @@ public function HTMLHead()
 
 	public function index()
 	{
-		require_once CORE_LIB_PATH.'/recaptcha/recaptchalib.php';
-
 		if(Auth::LoggedIn()) // Make sure they don't over-ride it
 		{
 			$this->render('login_already.tpl');
@@ -167,13 +165,10 @@ protected function ProcessRegistration()
 	protected function VerifyData()
 	{
 		$error = false;
+		$recaptcha = new \ReCaptcha\ReCaptcha(Config::Get('RECAPTCHA_PRIVATE_KEY'));
+		$resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
 
-		$resp = recaptcha_check_answer (Config::Get('RECAPTCHA_PRIVATE_KEY'),
-			$_SERVER["REMOTE_ADDR"],
-			$_POST["recaptcha_challenge_field"],
-			$_POST["recaptcha_response_field"]);
-
-		if(!$resp->is_valid)
+		if(!$resp->isSuccess())
 		{
 			$error = true;
 			$this->set('captcha_error', $resp->error);
@@ -256,4 +251,4 @@ protected function VerifyData()
 
 		return true;
 	}
-}
+}

core/templates/registration_mainform.tpl

@@ -90,9 +90,10 @@
 
 	<dt>reCaptcha</dt>
 	<dd>
-		<?php
-			echo recaptcha_get_html(Config::Get('RECAPTCHA_PUBLIC_KEY'), $captcha_error);
-		?>
+		<div class="g-recaptcha" data-sitekey="<?php echo Config::Get('RECAPTCHA_PUBLIC_KEY'); ?>"></div>
+		<script type="text/javascript"
+				src="https://www.google.com/recaptcha/api.js?hl=en">
+		</script>
 	</dd>
 
 	<dt></dt>