Merged unforgiving heads (and...)

Also updated public and private keys for reCAPTCHA. As well as the use of the new keys, Four Island now stores the private key along with the other
protected information that is not source controlled, instead of with the public key.

1 files changed, 5 insertions, 5 deletions

@@ -21,7 +21,8 @@
 if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
-require('includes/securimage/securimage.php');
+
+include('includes/recaptchalib.php');
 
 if (!isset($_POST['id']))
 {
@@ -39,11 +40,10 @@ if (!isset($_POST['id']))
                         } else {
                                 if (preg_match('/^[A-Za-z0-9!#$&\'*+-\/=?^_`{|}~]+@[-A-Za-z0-9]+(\.[-A-Za-z0-9]+)+[A-Za-z]$/', $_POST['email']))
                                 {
-                                        $img = new Securimage;
-                                        
-                                        if ($img->check($_POST['code']) == false)
+                                        $resp = recaptcha_check_answer ($privatekey, $_SERVER["REMOTE_ADDR"], $_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]);
+                                        if (!$resp->is_valid)
                                         {
-                                                die('The CAPTCHA wasn\'t entered correctly. Go back and try it again.');
+                                                die('The reCAPTCHA wasn\'t entered correctly. Go back and try it again.');
                                         } else {
                                                 $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $_POST['username'] . "\"";
                                                 $getanon2 = mysql_query($getanon);