From 2b5a191fb749aeaf7795b2e421ebf4b191fe7f30 Mon Sep 17 00:00:00 2001
From: Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
Date: Mon, 15 Apr 2019 14:07:12 +0300
Subject: [PATCH] Fix recaptcha

---
 ckan/lib/captcha.py                         |  2 +-
 ckan/templates/user/snippets/recaptcha.html | 36 ++++++++-------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/ckan/lib/captcha.py b/ckan/lib/captcha.py
index 9ba1ce01c4d..9a138dff1d7 100644
--- a/ckan/lib/captcha.py
+++ b/ckan/lib/captcha.py
@@ -17,7 +17,7 @@ def check_recaptcha(request):
     client_ip_address = request.environ.get('REMOTE_ADDR', 'Unknown IP Address')
 
     # reCAPTCHA v2
-    recaptcha_response_field = request.params.get('g-recaptcha-response', '')
+    recaptcha_response_field = request.form.get('g-recaptcha-response', '')
     recaptcha_server_name = 'https://www.google.com/recaptcha/api/siteverify'
 
     # recaptcha_response_field will be unicode if there are foreign chars in
diff --git a/ckan/templates/user/snippets/recaptcha.html b/ckan/templates/user/snippets/recaptcha.html
index c74362caa81..2807ddf59be 100644
--- a/ckan/templates/user/snippets/recaptcha.html
+++ b/ckan/templates/user/snippets/recaptcha.html
@@ -1,28 +1,18 @@
 <div class="form-group">
   <div class="controls">
-    {% if g.recaptcha_version == '1' %}
-      <script type="text/javascript" src="//www.google.com/recaptcha/api/challenge?k={{ public_key }}"></script>
-      
-      <noscript>
-        <iframe src="//www.google.com/recaptcha/api/noscript?k={{ public_key }}" height="300" width="500" frameborder="0"></iframe><br>
-        <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-        <input type="hidden" name="recaptcha_response_field" value="manual_challenge">
-      </noscript>
-    {% elif g.recaptcha_version == '2' %}
-      <script src="https://www.google.com/recaptcha/api.js" async defer></script>
-      <div class="g-recaptcha" data-sitekey="{{ public_key }}"></div>
-      
-      <noscript>
-        <div style="width: 304px; height: 352px; position: relative;">
-          <div style="width: 304px; height: 352px; position: absolute;">
-            <iframe src="https://www.google.com/recaptcha/api/fallback?k={{ public_key }}" frameborder="0" scrolling="no" style="width: 304px; height:352px"></iframe>
-          </div>
-          
-          <div style="width: 250px; height: 80px; position: absolute; bottom: 21px; left: 25px; margin: 0; padding: 0; right: 25px;">
-            <textarea id="g-recaptcha-response" name="g-recaptcha-response" style="width: 250px; height: 80px; border: 1px solid #c1c1c1;	margin: 0; padding: 0; resize: none;" class="g-recaptcha-response"></textarea>
-          </div>
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <div class="g-recaptcha" data-sitekey="{{ public_key }}"></div>
+
+    <noscript>
+      <div style="width: 304px; height: 352px; position: relative;">
+        <div style="width: 304px; height: 352px; position: absolute;">
+          <iframe src="https://www.google.com/recaptcha/api/fallback?k={{ public_key }}" frameborder="0" scrolling="no" style="width: 304px; height:352px"></iframe>
         </div>
-      </noscript>
-    {% endif %}
+
+        <div style="width: 250px; height: 80px; position: absolute; bottom: 21px; left: 25px; margin: 0; padding: 0; right: 25px;">
+          <textarea id="g-recaptcha-response" name="g-recaptcha-response" style="width: 250px; height: 80px; border: 1px solid #c1c1c1;	margin: 0; padding: 0; resize: none;" class="g-recaptcha-response"></textarea>
+        </div>
+      </div>
+    </noscript>
   </div>
 </div>