Updated links for pages moved from Meta to mw.org, tweaked doc a bit in one case...

[toast/cookiecaptcha.git] / ConfirmEdit_body.php

diff --git a/ConfirmEdit_body.php b/ConfirmEdit_body.php
index 5bb6e7e8d1a3dc59aa53c4c20e323b8e3c04c25a..8c0d78029426d17c9d4952da14096f077ce50131 100644 (file)
--- a/ConfirmEdit_body.php
+++ b/ConfirmEdit_body.php
@@ -39,8 +39,8 @@ class ConfirmEditHooks {
                return self::getInstance()->triggerUserLogin( $user, $password, $retval );
        }
 
                return self::getInstance()->triggerUserLogin( $user, $password, $retval );
        }
 

-       static function injectUserLogin( &$sp ) {
-               return self::getInstance()->injectUserLogin( $sp );
+       static function injectUserLogin( &$template ) {
+               return self::getInstance()->injectUserLogin( $template );

        }
 
        static function confirmUserLogin( $u, $pass, &$retval ) {
        }
 
        static function confirmUserLogin( $u, $pass, &$retval ) {


@@ -144,19 +144,18 @@ class SimpleCaptcha {
         * @param SimpleTemplate $template
         * @return bool true to keep running callbacks
         */
         * @param SimpleTemplate $template
         * @return bool true to keep running callbacks
         */

-       function injectUserCreate( &$sp ) {
+       function injectUserCreate( &$template ) {

                global $wgCaptchaTriggers, $wgOut, $wgUser;
                if ( $wgCaptchaTriggers['createaccount'] ) {
                        if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
                                wfDebug( "ConfirmEdit: user group allows skipping captcha on account creation\n" );
                                return true;
                        }
                global $wgCaptchaTriggers, $wgOut, $wgUser;
                if ( $wgCaptchaTriggers['createaccount'] ) {
                        if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
                                wfDebug( "ConfirmEdit: user group allows skipping captcha on account creation\n" );
                                return true;
                        }

-                       $sp->addFormHeader( 
+                       $template->set( 'header',

                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'createaccount' ) ) .
                                $this->getForm() .
                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'createaccount' ) ) .
                                $this->getForm() .

-                               "</div>\n"
-                       );
+                               "</div>\n" );

                }
                return true;
        }
                }
                return true;
        }


@@ -164,18 +163,18 @@ class SimpleCaptcha {
        /**
         * Inject a captcha into the user login form after a failed
         * password attempt as a speedbump for mass attacks.
        /**
         * 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
         */
         * @param SimpleTemplate $template
         * @return bool true to keep running callbacks
         */

-       function injectUserLogin( &$sp ) {
+       function injectUserLogin( &$template ) {

                if ( $this->isBadLoginTriggered() ) {
                        global $wgOut;
                if ( $this->isBadLoginTriggered() ) {
                        global $wgOut;

-                       $sp->addFormHeader(
+                       $template->set( 'header',

                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'badlogin' ) ) .
                                $this->getForm() .
                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'badlogin' ) ) .
                                $this->getForm() .

-                               "</div>\n"
-                       );
+                               "</div>\n" );

                }
                return true;
        }
                }
                return true;
        }


@@ -191,7 +190,7 @@ class SimpleCaptcha {
         */
        function triggerUserLogin( $user, $password, $retval ) {
                global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration, $wgMemc;
         */
        function triggerUserLogin( $user, $password, $retval ) {
                global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration, $wgMemc;

-               if ( $retval == Login::WRONG_PASS && $wgCaptchaTriggers['badlogin'] ) {
+               if ( $retval == LoginForm::WRONG_PASS && $wgCaptchaTriggers['badlogin'] ) {

                        $key = $this->badLoginKey();
                        $count = $wgMemc->get( $key );
                        if ( !$count ) {
                        $key = $this->badLoginKey();
                        $count = $wgMemc->get( $key );
                        if ( !$count ) {


@@ -558,7 +557,7 @@ class SimpleCaptcha {
                        if ( !$this->passCaptcha() ) {
                                $message = wfMsg( 'captcha-badlogin-fail' );
                                // Emulate a bad-password return to confuse the shit out of attackers
                        if ( !$this->passCaptcha() ) {
                                $message = wfMsg( 'captcha-badlogin-fail' );
                                // Emulate a bad-password return to confuse the shit out of attackers

-                               $retval = Login::WRONG_PASS;
+                               $retval = LoginForm::WRONG_PASS;

                                return false;
                        }
                }
                                return false;
                        }
                }