Changed captcha plugin to use Composer racaptcha (nocaptcha) lib inst…

…ead of static. Confirmed v2 use, ahead of impending death of v1.

plugins/fabrik_element/captcha/captcha.php

@@ -11,6 +11,9 @@
 // No direct access
 defined('_JEXEC') or die('Restricted access');
 
+use ReCaptcha\ReCaptcha;
+
+require_once JPATH_ROOT . '/plugins/fabrik_element/captcha/vendor/autoload.php';
 /**
  * Plugin element to captcha
  *
@@ -333,16 +336,8 @@ public function validate($data, $repeatCounter = 0)
 		{
 			if ($input->get('g-recaptcha-response'))
 			{
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/ReCaptcha.php';
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/RequestMethod.php';
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/RequestMethod/Post.php';
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/RequestMethod/Socket.php';
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/RequestMethod/SocketPost.php';
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/RequestParameters.php';
-				require_once JPATH_SITE . '/plugins/fabrik_element/captcha/libs/ReCaptcha/Response.php';
-
 				$privateKey = $params->get('recaptcha_privatekey');
-				$noCaptcha  = new \ReCaptcha\ReCaptcha($privateKey, new \ReCaptcha\RequestMethod\SocketPost());
+				$noCaptcha  = new ReCaptcha($privateKey, new \ReCaptcha\RequestMethod\SocketPost());
 				$response   = $input->get('g-recaptcha-response');
 				$server     = $input->server->get('REMOTE_ADDR');
 				$resp       = $noCaptcha->verify($response, $server);

plugins/fabrik_element/captcha/composer.json

@@ -0,0 +1,5 @@
+{
+  "require": {
+    "google/recaptcha": "~1.1"
+  }
+}

plugins/fabrik_element/captcha/layouts/fabrik-element-captcha-nocaptcha-invisible.php

@@ -0,0 +1,14 @@
+<?php
+defined('JPATH_BASE') or die;
+
+$d = $displayData;
+?>
+<script>
+	function nocaptchaSubmitForm() {
+		Fabrik.getBlock('<?php echo $d->formId; ?>').doSubmit();
+	}
+</script>
+
+<div class ="g-recaptcha" data-sitekey="<?php echo $d->site_key; ?>" data-bind="<?php echo $d->btnId; ?>" data-callback="nocaptchaSubmitForm"></div>
+
+<script src="https://www.google.com/recaptcha/api.js?hl=<?php echo $d->lang; ?>" async defer></script>

plugins/fabrik_element/captcha/vendor/autoload.php

@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit87f051b7c7baf609b29e5e7f79ec515a::getLoader();