Don't check badlogin attempts in memcached if we are not configured to show captchas...

[toast/cookiecaptcha.git] / FancyCaptcha.class.php

diff --git a/FancyCaptcha.class.php b/FancyCaptcha.class.php
index 0d74116557d05f517c400ae5dc8961158e0f397b..26227aa30bc11fd0014bc8917e547d664d2baaa2 100644 (file)
--- a/FancyCaptcha.class.php
+++ b/FancyCaptcha.class.php
@@ -44,7 +44,7 @@ class FancyCaptcha extends SimpleCaptcha {
        function getForm() {
                $info = $this->pickImage();
                if ( !$info ) {
        function getForm() {
                $info = $this->pickImage();
                if ( !$info ) {

-                       die( "out of captcha images; this shouldn't happen" );
+                       throw new MWException( "Ran out of captcha images" );

                }
 
                // Generate a random key for use of this captcha image in this session.
                }
 
                // Generate a random key for use of this captcha image in this session.


@@ -69,9 +69,10 @@ class FancyCaptcha extends SimpleCaptcha {
                                'id'    => 'wpCaptchaId',
                                'value' => $index ) ) .
                        "<p>" .
                                'id'    => 'wpCaptchaId',
                                'value' => $index ) ) .
                        "<p>" .

-                       Xml::element( 'input', array(
+                       Html::element( 'input', array(

                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',

+                               'required',

                                'tabindex' => 1 ) ) . // tab in before the edit textarea
                        "</p>\n";
        }
                                'tabindex' => 1 ) ) . // tab in before the edit textarea
                        "</p>\n";
        }


@@ -166,7 +167,7 @@ class FancyCaptcha extends SimpleCaptcha {
        }
 
        function showImage() {
        }
 
        function showImage() {

-               global $wgOut, $wgRequest;
+               global $wgOut;

 
                $wgOut->disable();
 
 
                $wgOut->disable();
 


@@ -227,4 +228,23 @@ class FancyCaptcha extends SimpleCaptcha {
                # the default for edits
                return wfEmptyMsg( $name, $text ) ? wfMsg( 'fancycaptcha-edit' ) : $text;
        }
                # the default for edits
                return wfEmptyMsg( $name, $text ) ? wfMsg( 'fancycaptcha-edit' ) : $text;
        }

+
+       /**
+        * Delete a solved captcha image, if $wgCaptchaDeleteOnSolve is true.
+        */
+       function passCaptcha() {
+               global $wgCaptchaDeleteOnSolve;
+
+               $info = $this->retrieveCaptcha(); // get the captcha info before it gets deleted
+               $pass = parent::passCaptcha();
+
+               if ( $pass && $wgCaptchaDeleteOnSolve ) {
+                       $filename = $this->imagePath( $info['salt'], $info['hash'] );
+                       if ( file_exists( $filename ) ) {
+                               unlink( $filename );
+                       }
+               }
+
+               return $pass;
+       }

 }
 }