$wgPasswordAttemptThrottle cleanup

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2feb33c..a9e3009 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3362,4 +3362,4 @@ $wgUseAutomaticEditSummaries = true;
  * Limit password attempts to X attempts per Y seconds per IP per account.
  * Requires memcached.
  */
-$wgPasswordAttemptThrottle = array( 5, 300 );
\ No newline at end of file
+$wgPasswordAttemptThrottle = array( 'count' => 5, 'seconds' => 300 );

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index f597d62..4719a71 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -375,19 +375,19 @@ class LoginForm {
                }
                
                global $wgPasswordAttemptThrottle;
-               if (is_array($wgPasswordAttemptThrottle) && count($wgPasswordAttemptThrottle) >=2) {
-                       list($count,$period) = $wgPasswordAttemptThrottle;
+               if ( is_array($wgPasswordAttemptThrottle) ) {
                        $key = wfMemcKey( 'password-throttle', wfGetIP(), $this->mName );
+                       $count = $wgPasswordAttemptThrottle['count'];
+                       $period = $wgPasswordAttemptThrottle['seconds'];
                        
                        global $wgMemc;
                        $cur = $wgMemc->get($key);
-                       if ($cur>0 && $cur<$count) {
+                       if ( !$cur ) {
+                               $wgMemc->add( $key, 1, $period ); // start counter
+                       } else if ( $cur < $count ) {
                                $wgMemc->incr($key);
-                               // Okay
-                       } elseif ($cur>0) {
+                       } else if ( $cur >= $count ) {
                                return self::THROTTLED;
-                       } elseif (!$cur) {
-                               $wgMemc->add( $key, 1, $period );
                        }
                }