(bug 13918), make CAPTCHA less obtrusive. Added a new global $wgCaptchaBadLoginAttemp...

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 2f7173e992d1e0e5b35f2d0554f970819275e7d6..828570355fb8893d0abe01c80909be247822f7cb 100644 (file)
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -149,6 +149,14 @@ $wgCaptchaBadLoginExpiration = 5 * 60;
 global $ceAllowConfirmedEmail;
 $ceAllowConfirmedEmail = false;
 
+/** 
+ * Number of bad login attempts allowed before triggering the captcha.
+ * 
+ * Default is 0.
+ */
+global $wgCaptchaBadLoginAttempts;
+$wgCaptchaBadLoginAttempts = 0;
+
 /**
  * Regex to whitelist URLs to known-good sites...
  * For instance:

diff --git a/ConfirmEdit_body.php b/ConfirmEdit_body.php
index bdebfec6c67320a97b216d1bfaf664ce82d012d0..31635dac4323d4c7d2006320abb74bec78b5655f 100644 (file)
--- a/ConfirmEdit_body.php
+++ b/ConfirmEdit_body.php
@@ -204,8 +204,8 @@ class SimpleCaptcha {
         * @access private
         */
        function isBadLoginTriggered() {
-               global $wgMemc;
-               return intval( $wgMemc->get( $this->badLoginKey() ) ) > 0;
+               global $wgMemc, $wgCaptchaBadLoginAttempts;
+               return intval( $wgMemc->get( $this->badLoginKey() ) ) > $wgCaptchaBadLoginAttempts;
        }
        
        /**