Merge pull request #30 from domstubbs/master

Include 'remoteip' with verify requests where possible

src/config.php

@@ -27,5 +27,6 @@
     "siteKey" => "",
     "secretKey" => "",
     "validateContactForm" => true,
-
+    "shareUserIPs" => false,
+
 ];

src/models/Settings.php

@@ -56,6 +56,13 @@ class Settings extends Model
      */
     public $validateContactForm = true;
 
+    /**
+     * Share user IP addresses with Google
+     *
+     * @var bool
+     */
+    public $shareUserIPs = false;
+
 
 
     // Public Methods

src/services/CraftRecaptchaService.php

@@ -70,6 +70,14 @@ public function verify($data)
           'response' => $data
       );
 
+      if ($settings->shareUserIPs) {
+        $ip = Craft::$app->getRequest()->userIP;
+
+        if ($ip) {
+            $params['remoteip'] = $ip;
+        }
+      }
+
       $client = new GuzzleHttp\Client();
       $response = $client->request('POST', $base, ['form_params' => $params]);
 

src/templates/settings.twig

@@ -45,3 +45,11 @@
     name: 'validateContactForm',
     on: settings['validateContactForm']})
 }}
+
+{{ forms.lightswitchField({
+    label: 'Share user IPs with Google?'|t('recaptcha'),
+    instructions: 'Enable to include requesting user IP addresses when making [siteverify](https://developers.google.com/recaptcha/docs/verify#api_request) requests.'|t('recaptcha'),
+    id: 'shareUserIPs',
+    name: 'shareUserIPs',
+    on: settings['shareUserIPs']})
+}}

src/translations/en/recaptcha.php

@@ -27,4 +27,5 @@
     'Enter your reCAPTCHA site key.' => 'Enter your reCAPTCHA site key.',
     'Enter your reCAPTCHA secret key.' => 'Enter your reCAPTCHA secret key.',
     'Validate contact forms?' => 'Validate contact forms?',
+    'Share user IPs with Google?' => 'Share user IPs with Google?',
 ];