2 files changed, 10 insertions, 29 deletions

@@ -24,38 +24,20 @@ require('headerproc.php');
 
 $noMembers=1;
 
-include('includes/recaptchalib.php');
-$publickey = "6LfgvgEAAAAAAG_BJMkWk8sNcT1nBaGoXKJYb-JT";
-$privatekey = "6LfgvgEAAAAAAD0_UVLp57MU7tqcypsbZPS9qTnr";
-
 if (!isset($_GET['submit']))
 {
         $template = new FITemplate('login');
         $template->add('REDIRECT',$_GET['redirect']);
-
-        $template->add('RECAPTCHA',recaptcha_get_html($publickey));
 } else {
-        $resp = recaptcha_check_answer($privatekey, $_SERVER["REMOTE_ADDR"], $_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]);
-        if (!$resp->is_valid)
+        if (verifyUser($_POST['username'], $_POST['password']))
         {
-                $template = new FITemplate('login');
-                $template->add('REDIRECT',$_GET['redirect']);
-                $template->adds_block('ERROR',array('msg' => "The reCAPTCHA wasn't entered correctly. Go back and try it again. (reCAPTCHA said: " . $resp->error . ")"));
-
-                $template->add('RECAPTCHA',recaptcha_get_html($publickey));
+                sess_set('uname',$_POST['username']);
+                header('Location: ' . rawurldecode($_POST['redirect']));
+                exit;
         } else {
-                if (verifyUser($_POST['username'], $_POST['password']))
-                {
-                        sess_set('uname',$_POST['username']);
-                        header('Location: ' . rawurldecode($_POST['redirect']));
-                        exit;
-                } else {
-                        $template = new FITemplate('login');
-                        $template->add('REDIRECT',$_POST['redirect']);
-                        $template->adds_block('ERROR',array('MSG' => "The username/password pair didn't resolve to a real user. Try logging on again, spelling the password right, or making sure you actually have an a account."));
-
-                        $template->add('RECAPTCHA',recaptcha_get_html($publickey));
-                }
+                $template = new FITemplate('login');
+                $template->add('REDIRECT',$_POST['redirect']);
+                $template->adds_block('ERROR',array('MSG' => "The username/password pair didn't resolve to a real user. Try logging on again, spelling the password right, or making sure you actually have an a account."));
         }
 }
 
@@ -9,10 +9,9 @@ To post feedback on this site, and also to post on the forums, you must be a mem
 Sadly, currently membership is invitation-only. But hopefully that will change in the near future.<BR>
 HOWEVER, you may request membership by email hatkirby@fourisland.com (link on the right).<BR>
 A NOTICE TO ALL MEMBERS! Do NOT share your password with anyone! If you misplace your password send an email to hatkirby@fourisland.com (link on the right).<P>
-<FORM ACTION="login.php?submit=" METHOD="POST">

-        <LABEL FOR="username">Username:</LABEL><INPUT TYPE="text" NAME="username" ID="username"><BR>

+<FORM ACTION="login.php?submit=" METHOD="POST">
+        <LABEL FOR="username">Username:</LABEL><INPUT TYPE="text" NAME="username" ID="username"><BR>
         <LABEL FOR="password">Password:</LABEL><INPUT TYPE="password" NAME="password" ID="password"><BR>
-        <!--RECAPTCHA-->
-        <INPUT TYPE="hidden" NAME="redirect" VALUE="<!--REDIRECT-->">

+        <INPUT TYPE="hidden" NAME="redirect" VALUE="<!--REDIRECT-->">
         <INPUT TYPE="submit">
 </FORM></CENTER>