update the recaptcha module, make it use the proper interfaces

[osqa.git] / forum_modules / recaptcha / lib / captcha.py

diff --git a/forum_modules/recaptcha/lib/captcha.py b/forum_modules/recaptcha/lib/captcha.py
index 03323eeaaaecaef16369d3753946e4b6bdb26316..c165dc929aab1f2fedf3c339087d42e5265ba704 100644 (file)
--- a/forum_modules/recaptcha/lib/captcha.py
+++ b/forum_modules/recaptcha/lib/captcha.py
@@ -1,8 +1,8 @@
 import urllib2, urllib
 
 import urllib2, urllib
 

-API_SSL_SERVER="https://api-secure.recaptcha.net"
-API_SERVER="http://api.recaptcha.net"
-VERIFY_SERVER="api-verify.recaptcha.net"
+API_SSL_SERVER="https://www.google.com/recaptcha/api"
+API_SERVER="http://www.google.com/recaptcha/api"
+VERIFY_SERVER="www.google.com"

 
 class RecaptchaResponse(object):
     def __init__(self, is_valid, error_code=None):
 
 class RecaptchaResponse(object):
     def __init__(self, is_valid, error_code=None):


@@ -66,20 +66,20 @@ def submit (recaptcha_challenge_field,
         return s
 
     params = urllib.urlencode ({
         return s
 
     params = urllib.urlencode ({

-            'privatekey': encode_if_necessary(private_key),
-            'remoteip' :  encode_if_necessary(remoteip),
-            'challenge':  encode_if_necessary(recaptcha_challenge_field),
-            'response' :  encode_if_necessary(recaptcha_response_field),
-            })
+        'privatekey': encode_if_necessary(private_key),
+        'remoteip' :  encode_if_necessary(remoteip),
+        'challenge':  encode_if_necessary(recaptcha_challenge_field),
+        'response' :  encode_if_necessary(recaptcha_response_field),
+        })

 
     request = urllib2.Request (
 
     request = urllib2.Request (

-        url = "http://%s/verify" % VERIFY_SERVER,
+        url = "http://%s/recaptcha/api/verify" % VERIFY_SERVER,

         data = params,
         headers = {
             "Content-type": "application/x-www-form-urlencoded",
             "User-agent": "reCAPTCHA Python"
         data = params,
         headers = {
             "Content-type": "application/x-www-form-urlencoded",
             "User-agent": "reCAPTCHA Python"

-            }
-        )
+        }
+    )

 
     httpresp = urllib2.urlopen (request)
 
 
     httpresp = urllib2.urlopen (request)
 


@@ -91,6 +91,4 @@ def submit (recaptcha_challenge_field,
     if (return_code == "true"):
         return RecaptchaResponse (is_valid=True)
     else:
     if (return_code == "true"):
         return RecaptchaResponse (is_valid=True)
     else:

-        return RecaptchaResponse (is_valid=False, error_code = return_values [1])
-
-
+        return RecaptchaResponse (is_valid=False, error_code = return_values [1])
\ No newline at end of file