Merge in Login rewrite, second time lucky.

[toast/cookiecaptcha.git] / ConfirmEdit_body.php

diff --git a/ConfirmEdit_body.php b/ConfirmEdit_body.php
index 8522184821344f21dc19fbfb781f82531c7a47fd..4ec7ff511e1e54d3e48704d8e4aaf04de0f71397 100644 (file)
--- a/ConfirmEdit_body.php
+++ b/ConfirmEdit_body.php
@@ -23,7 +23,7 @@ class ConfirmEditHooks {
                return self::getInstance()->confirmEditMerged( $editPage, $newtext );
        }
 
-       static function confirmEditAPI( &$editPage, $newtext, &$resultArr ) {
+       static function confirmEditAPI( $editPage, $newtext, &$resultArr ) {
                return self::getInstance()->confirmEditAPI( $editPage, $newtext, $resultArr );
        }
 
@@ -39,8 +39,8 @@ class ConfirmEditHooks {
                return self::getInstance()->triggerUserLogin( $user, $password, $retval );
        }
 
-       static function injectUserLogin( &$template ) {
-               return self::getInstance()->injectUserLogin( $template );
+       static function injectUserLogin( &$sp ) {
+               return self::getInstance()->injectUserLogin( $sp );
        }
 
        static function confirmUserLogin( $u, $pass, &$retval ) {
@@ -144,18 +144,18 @@ class SimpleCaptcha {
         * @param SimpleTemplate $template
         * @return bool true to keep running callbacks
         */
-       function injectUserCreate( &$template ) {
+       function injectUserCreate( &$sp ) {
                global $wgCaptchaTriggers, $wgOut, $wgUser;
                if ( $wgCaptchaTriggers['createaccount'] ) {
                        if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
                                wfDebug( "ConfirmEdit: user group allows skipping captcha on account creation\n" );
                                return true;
                        }
-                       $template->set( 'header',
+                       $sp->mFormHeader .= 
                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'createaccount' ) ) .
                                $this->getForm() .
-                               "</div>\n" );
+                               "</div>\n";
                }
                return true;
        }
@@ -163,18 +163,17 @@ class SimpleCaptcha {
        /**
         * Inject a captcha into the user login form after a failed
         * password attempt as a speedbump for mass attacks.
-        * @fixme if multiple thingies insert a header, could break
         * @param SimpleTemplate $template
         * @return bool true to keep running callbacks
         */
-       function injectUserLogin( &$template ) {
+       function injectUserLogin( &$sp ) {
                if ( $this->isBadLoginTriggered() ) {
                        global $wgOut;
-                       $template->set( 'header',
+                       $sp->mFormHeader .= 
                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'badlogin' ) ) .
                                $this->getForm() .
-                               "</div>\n" );
+                               "</div>\n";
                }
                return true;
        }
@@ -190,7 +189,7 @@ class SimpleCaptcha {
         */
        function triggerUserLogin( $user, $password, $retval ) {
                global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration, $wgMemc;
-               if ( $retval == LoginForm::WRONG_PASS && $wgCaptchaTriggers['badlogin'] ) {
+               if ( $retval == Login::WRONG_PASS && $wgCaptchaTriggers['badlogin'] ) {
                        $key = $this->badLoginKey();
                        $count = $wgMemc->get( $key );
                        if ( !$count ) {
@@ -284,8 +283,7 @@ class SimpleCaptcha {
                }
                if ( $this->isIPWhitelisted() )
                        return false;
-               if ( $editPage->allowBlankSummary )
-                       return false;
+
 
                global $wgEmailAuthentication, $ceAllowConfirmedEmail;
                if ( $wgEmailAuthentication && $ceAllowConfirmedEmail &&
@@ -510,7 +508,7 @@ class SimpleCaptcha {
        }
 
 
-       function confirmEditAPI( &$editPage, $newtext, &$resultArr ) {
+       function confirmEditAPI( $editPage, $newtext, &$resultArr ) {
                if ( !$this->doConfirmEdit( $editPage, $newtext, false, false ) ) {
                        $this->addCaptchaAPI( $resultArr );
                        return false;
@@ -558,7 +556,7 @@ class SimpleCaptcha {
                        if ( !$this->passCaptcha() ) {
                                $message = wfMsg( 'captcha-badlogin-fail' );
                                // Emulate a bad-password return to confuse the shit out of attackers
-                               $retval = LoginForm::WRONG_PASS;
+                               $retval = Login::WRONG_PASS;
                                return false;
                        }
                }