From c4a9368a7b6a2e37dec0b808c1ae5aafefa6b578 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 18 Jul 2018 21:39:33 -0400
Subject: [PATCH] #641 Fix invisible recaptcha

---
 index.php         | 20 +++++++++-----------
 submit_ticket.php |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/index.php b/index.php
index 408a7935..141c7269 100644
--- a/index.php
+++ b/index.php
@@ -1228,23 +1228,21 @@ function print_add_ticket()
                     <!-- >
                     <input type="text" name="phone" value="3" />
                     < -->
+
+                    <?php
+                    // Use Invisible reCAPTCHA?
+                    if ($hesk_settings['secimg_use'] && $hesk_settings['recaptcha_use'] == 1 && ! isset($_SESSION['img_verified'])) {
+                        ?>
+                        <div class="g-recaptcha" data-sitekey="<?php echo $hesk_settings['recaptcha_public_key']; ?>" data-bind="recaptcha-submit" data-callback="recaptcha_submitForm"></div>
+                        <?php
+                    }
+                    ?>
             </form>
             <script>
                 buildValidatorForTicketSubmission("form1",
                     "<?php echo addslashes($hesklang['select_at_least_one_value']); ?>");
             </script>
         </div>
-
-        <?php
-        // Use Invisible reCAPTCHA?
-        if ($hesk_settings['secimg_use'] && $hesk_settings['recaptcha_use'] == 1 && ! isset($_SESSION['img_verified'])) {
-        ?>
-            <div class="g-recaptcha" data-sitekey="<?php echo $hesk_settings['recaptcha_public_key']; ?>" data-bind="recaptcha-submit" data-callback="recaptcha_submitForm"></div>
-        <?php
-        }
-        ?>
-
-    </form>
     <?php if ($columnWidth == 'col-md-10 col-md-offset-1'): ?>
     <div class="col-md-1">&nbsp;</div></div>
 <?php endif; ?>
diff --git a/submit_ticket.php b/submit_ticket.php
index 234d1858..f2b15a90 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -91,7 +91,7 @@ if ($hesk_settings['secimg_use'] && !isset($_SESSION['img_verified'])) {
 
         // Was there a reCAPTCHA response?
         if (isset($_POST["g-recaptcha-response"])) {
-            $resp = $reCaptcha->verifyResponse($_SERVER["REMOTE_ADDR"], hesk_POST("g-recaptcha-response"));
+            $resp = $reCaptcha->verifyResponse(hesk_getClientIP(), hesk_POST("g-recaptcha-response"));
         }
 
         if ($resp != null && $resp->success) {