* (bug 8437) Make Title::loadRestrictions() initialise $mRestrictions properly
[lhc/web/wiklou.git] / includes / SpecialUserlogin.php
index 89eedcb..e60e3d5 100644 (file)
@@ -6,20 +6,15 @@
  */
 
 /**
- *
- */
-require_once('UserMailer.php');
-
-/**
- * consutrctor
+ * constructor
  */
 function wfSpecialUserlogin() {
        global $wgCommandLineMode;
        global $wgRequest;
-       if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] )  ) {
-               User::SetupSession();
+       if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] )  ) {
+               wfSetupSession();
        }
-       
+
        $form = new LoginForm( $wgRequest );
        $form->execute();
 }
@@ -29,36 +24,67 @@ function wfSpecialUserlogin() {
  * @package MediaWiki
  * @subpackage SpecialPage
  */
+
 class LoginForm {
-       var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
+
+       const SUCCESS = 0;
+       const NO_NAME = 1;
+       const ILLEGAL = 2;
+       const WRONG_PLUGIN_PASS = 3;
+       const NOT_EXISTS = 4;
+       const WRONG_PASS = 5;
+       const EMPTY_PASS = 6;
+       const RESET_PASS = 7;
+
+       var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
        var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
-       var $mLoginattempt, $mRemember, $mEmail;
-       
+       var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
+
+       /**
+        * Constructor
+        * @param webrequest $request A webrequest object passed by reference
+        */
        function LoginForm( &$request ) {
-               global $wgLang, $wgAllowRealName;
+               global $wgLang, $wgAllowRealName, $wgEnableEmail;
+               global $wgAuth;
 
+               $this->mType = $request->getText( 'type' );
                $this->mName = $request->getText( 'wpName' );
                $this->mPassword = $request->getText( 'wpPassword' );
                $this->mRetype = $request->getText( 'wpRetype' );
-               $this->mReturnto = $request->getVal( 'returnto' );
+               $this->mDomain = $request->getText( 'wpDomain' );
+               $this->mReturnTo = $request->getVal( 'returnto' );
                $this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
                $this->mPosted = $request->wasPosted();
                $this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
-               $this->mCreateaccountMail = $request->getCheck( 'wpCreateaccountMail' );
-               $this->mMailmypassword = $request->getCheck( 'wpMailmypassword' );
+               $this->mCreateaccountMail = $request->getCheck( 'wpCreateaccountMail' )
+                                           && $wgEnableEmail;
+               $this->mMailmypassword = $request->getCheck( 'wpMailmypassword' )
+                                        && $wgEnableEmail;
                $this->mLoginattempt = $request->getCheck( 'wpLoginattempt' );
                $this->mAction = $request->getVal( 'action' );
                $this->mRemember = $request->getCheck( 'wpRemember' );
-               $this->mEmail = $request->getText( 'wpEmail' );
-               if ($wgAllowRealName) {
+               $this->mLanguage = $request->getText( 'uselang' );
+
+               if( $wgEnableEmail ) {
+                       $this->mEmail = $request->getText( 'wpEmail' );
+               } else {
+                       $this->mEmail = '';
+               }
+               if( $wgAllowRealName ) {
                    $this->mRealName = $request->getText( 'wpRealName' );
                } else {
                    $this->mRealName = '';
                }
-           
+
+               if( !$wgAuth->validDomain( $this->mDomain ) ) {
+                       $this->mDomain = 'invaliddomain';
+               }
+               $wgAuth->setDomain( $this->mDomain );
+
                # When switching accounts, it sucks to get automatically logged out
-               if( $this->mReturnto == $wgLang->specialPage( 'Userlogout' ) ) {
-                       $this->mReturnto = '';
+               if( $this->mReturnTo == $wgLang->specialPage( 'Userlogout' ) ) {
+                       $this->mReturnTo = '';
                }
        }
 
@@ -73,7 +99,7 @@ class LoginForm {
                                return $this->addNewAccountMailPassword();
                        } else if ( $this->mMailmypassword ) {
                                return $this->mailPassword();
-                       } else if ( ( 'submit' == $this->mAction ) || $this->mLoginattempt ) {
+                       } else if ( ( 'submitlogin' == $this->mAction ) || $this->mLoginattempt ) {
                                return $this->processLogin();
                        }
                }
@@ -81,11 +107,11 @@ class LoginForm {
        }
 
        /**
-        * @access private
+        * @private
         */
        function addNewAccountMailPassword() {
                global $wgOut;
-               
+
                if ('' == $this->mEmail) {
                        $this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
                        return;
@@ -97,171 +123,360 @@ class LoginForm {
                        return;
                }
 
+               // Wipe the initial password and mail a temporary one
+               $u->setPassword( null );
                $u->saveSettings();
-               $error = $this->mailPasswordInternal($u);
+               $result = $this->mailPasswordInternal( $u, false );
+
+               wfRunHooks( 'AddNewAccount', array( $u ) );
 
                $wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
-       
-               if ( $error === '' ) {
+
+               if( WikiError::isError( $result ) ) {
+                       $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
+               } else {
                        $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
                        $wgOut->returnToMain( false );
-               } else {
-                       $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
                }
-
                $u = 0;
        }
 
 
        /**
-        * @access private
+        * @private
         */
        function addNewAccount() {
-               global $wgUser, $wgOut;
-               global $wgDeferredUpdateList;
-
+               global $wgUser, $wgEmailAuthentication;
+               
+               # Create the account and abort if there's a problem doing so
                $u = $this->addNewAccountInternal();
-
-               if ($u == NULL) {
+               if( $u == NULL )
                        return;
+                       
+               # If we showed up language selection links, and one was in use, be
+               # smart (and sensible) and save that language as the user's preference
+               global $wgLoginLanguageSelector;
+               if( $wgLoginLanguageSelector && $this->mLanguage )
+                       $u->setOption( 'language', $this->mLanguage );
+
+               # Save user settings and send out an email authentication message if needed
+               $u->saveSettings();
+               if( $wgEmailAuthentication && User::isValidEmailAddr( $u->getEmail() ) ) {
+                       global $wgOut;
+                       $error = $u->sendConfirmationMail();
+                       if( WikiError::isError( $error ) ) {
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_sendfailed', $error->getMessage() ) );
+                       } else {
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_oncreate' ) );
+                       }
                }
 
-               $wgUser = $u;
-               $wgUser->setCookies();
-
-               $up = new UserUpdate();
-               array_push( $wgDeferredUpdateList, $up );
-
-               if( $this->hasSessionCookie() ) {
-                       return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
+               # If not logged in, assume the new account as the current one and set session cookies
+               # then show a "welcome" message or a "need cookies" message as needed
+               if( $wgUser->isAnon() ) {
+                       $wgUser = $u;
+                       $wgUser->setCookies();
+                       wfRunHooks( 'AddNewAccount', array( $wgUser ) );
+                       if( $this->hasSessionCookie() ) {
+                               return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ), false );
+                       } else {
+                               return $this->cookieRedirectCheck( 'new' );
+                       }
                } else {
-                       return $this->cookieRedirectCheck( 'new' );
+                       # Confirm that the account was created
+                       global $wgOut;
+                       $self = SpecialPage::getTitleFor( 'Userlogin' );
+                       $wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) );
+                       $wgOut->setArticleRelated( false );
+                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
+                       $wgOut->addHtml( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
+                       $wgOut->returnToMain( $self->getPrefixedText() );
+                       wfRunHooks( 'AddNewAccount', array( $u ) );
+                       return true;
                }
        }
 
-
        /**
-        * @access private
+        * @private
         */
        function addNewAccountInternal() {
                global $wgUser, $wgOut;
-               global $wgMaxNameChars;
-               global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
+               global $wgEnableSorbs, $wgProxyWhitelist;
+               global $wgMemc, $wgAccountCreationThrottle;
+               global $wgAuth, $wgMinimalPasswordLength;
+
+               // If the user passes an invalid domain, something is fishy
+               if( !$wgAuth->validDomain( $this->mDomain ) ) {
+                       $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+                       return false;
+               }
+
+               // If we are not allowing users to login locally, we should
+               // be checking to see if the user is actually able to
+               // authenticate to the authentication server before they
+               // create an account (otherwise, they can create a local account
+               // and login as any domain user). We only need to check this for
+               // domains that aren't local.
+               if( 'local' != $this->mDomain && '' != $this->mDomain ) {
+                       if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mName ) || !$wgAuth->authenticate( $this->mName, $this->mPassword ) ) ) {
+                               $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+                               return false;
+                       }
+               }
+
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+                       return false;
+               }
 
                if (!$wgUser->isAllowedToCreateAccount()) {
                        $this->userNotPrivilegedMessage();
-                       return;
+                       return false;
                }
 
-               if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
-                       $this->mainLoginForm( wfMsg( 'badretype' ) );
+               $ip = wfGetIP();
+               if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) &&
+                 $wgUser->inSorbsBlacklist( $ip ) )
+               {
+                       $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
                        return;
                }
-               
+
                $name = trim( $this->mName );
-               $u = User::newFromName( $name );
-               if ( is_null( $u ) ||
-                 ( '' == $name ) ||
-                 preg_match( "/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}/", $name ) ||
-                 (strpos( $name, "/" ) !== false) ||
-                 (strlen( $name ) > $wgMaxNameChars) ||
-                 ucFirst($name) != $u->getName() ) 
-               {
+               $u = User::newFromName( $name, 'creatable' );
+               if ( is_null( $u ) ) {
                        $this->mainLoginForm( wfMsg( 'noname' ) );
-                       return;
-               }
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
+                       return false;
                }
-               
+
                if ( 0 != $u->idForName() ) {
                        $this->mainLoginForm( wfMsg( 'userexists' ) );
-                       return;
+                       return false;
+               }
+
+               if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
+                       $this->mainLoginForm( wfMsg( 'badretype' ) );
+                       return false;
+               }
+
+               if ( !$wgUser->isValidPassword( $this->mPassword ) ) {
+                       $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+                       return false;
+               }
+
+               $abortError = '';
+               if( !wfRunHooks( 'AbortNewAccount', array( $u, &$abortError ) ) ) {
+                       // Hook point to add extra creation throttles and blocks
+                       wfDebug( "LoginForm::addNewAccountInternal: a hook blocked creation\n" );
+                       $this->mainLoginForm( $abortError );
+                       return false;
                }
 
                if ( $wgAccountCreationThrottle ) {
-                       $key = $wgDBname.':acctcreate:ip:'.$wgIP;
+                       $key = wfMemcKey( 'acctcreate', 'ip', $ip );
                        $value = $wgMemc->incr( $key );
                        if ( !$value ) {
                                $wgMemc->set( $key, 1, 86400 );
                        }
                        if ( $value > $wgAccountCreationThrottle ) {
                                $this->throttleHit( $wgAccountCreationThrottle );
-                               return;
+                               return false;
                        }
                }
 
+               if( !$wgAuth->addUser( $u, $this->mPassword ) ) {
+                       $this->mainLoginForm( wfMsg( 'externaldberror' ) );
+                       return false;
+               }
+
+               # Update user count
+               $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
+               $ssUpdate->doUpdate();
+
+               return $this->initUser( $u );
+       }
+
+       /**
+        * Actually add a user to the database.
+        * Give it a User object that has been initialised with a name.
+        *
+        * @param $u User object.
+        * @return User object.
+        * @private
+        */
+       function initUser( $u ) {
                $u->addToDatabase();
                $u->setPassword( $this->mPassword );
                $u->setEmail( $this->mEmail );
                $u->setRealName( $this->mRealName );
+               $u->setToken();
+
+               global $wgAuth;
+               $wgAuth->initUser( $u );
+
+               $u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
+               $u->saveSettings();
 
-               if ( $this->mRemember ) { $r = 1; }
-               else { $r = 0; }
-               $u->setOption( 'rememberpassword', $r );
-               
                return $u;
        }
 
        /**
-        * @access private
+        * Internally authenticate the login request.
+        *
+        * This may create a local account as a side effect if the
+        * authentication plugin allows transparent local account
+        * creation.
+        *
+        * @public
         */
-       function processLogin() {
-               global $wgUser;
-               global $wgDeferredUpdateList;
-
+       function authenticateUserData() {
+               global $wgUser, $wgAuth;
                if ( '' == $this->mName ) {
-                       $this->mainLoginForm( wfMsg( 'noname' ) );
-                       return;
+                       return self::NO_NAME;
                }
                $u = User::newFromName( $this->mName );
-               if( is_null( $u ) ) {
-                       $this->mainLoginForm( wfMsg( 'noname' ) );
-                       return;
-               }
-               $id = $u->idForName();
-               if ( 0 == $id ) {
-                       $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
-                       return;
-               }
-               $u->setId( $id );
-               $u->loadFromDatabase();
-               if (!$u->checkPassword( $this->mPassword )) {
-                       $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
-                       return;
-               }
-
-               # We've verified now, update the real record
-               #
-               if ( $this->mRemember ) {
-                       $r = 1;
+               if( is_null( $u ) || !User::isUsableName( $u->getName() ) ) {
+                       return self::ILLEGAL;
+               }
+               if ( 0 == $u->getID() ) {
+                       global $wgAuth;
+                       /**
+                        * If the external authentication plugin allows it,
+                        * automatically create a new account for users that
+                        * are externally defined but have not yet logged in.
+                        */
+                       if ( $wgAuth->autoCreate() && $wgAuth->userExists( $u->getName() ) ) {
+                               if ( $wgAuth->authenticate( $u->getName(), $this->mPassword ) ) {
+                                       $u = $this->initUser( $u );
+                               } else {
+                                       return self::WRONG_PLUGIN_PASS;
+                               }
+                       } else {
+                               return self::NOT_EXISTS;
+                       }
                } else {
-                       $r = 0;
+                       $u->load();
                }
-               $u->setOption( 'rememberpassword', $r );
 
-               $wgUser = $u;
-               $wgUser->setCookies();
+               if (!$u->checkPassword( $this->mPassword )) {
+                       if( $u->checkTemporaryPassword( $this->mPassword ) ) {
+                               // The e-mailed temporary password should not be used
+                               // for actual logins; that's a very sloppy habit,
+                               // and insecure if an attacker has a few seconds to
+                               // click "search" on someone's open mail reader.
+                               //
+                               // Allow it to be used only to reset the password
+                               // a single time to a new value, which won't be in
+                               // the user's e-mail archives.
+                               //
+                               // For backwards compatibility, we'll still recognize
+                               // it at the login form to minimize surprises for
+                               // people who have been logging in with a temporary
+                               // password for some time.
+                               //
+                               // As a side-effect, we can authenticate the user's
+                               // e-mail address if it's not already done, since
+                               // the temporary password was sent via e-mail.
+                               //
+                               if( !$u->isEmailConfirmed() ) {
+                                       $u->confirmEmail();
+                               }
+                               
+                               // At this point we just return an appropriate code
+                               // indicating that the UI should show a password
+                               // reset form; bot interfaces etc will probably just
+                               // fail cleanly here.
+                               //
+                               return self::RESET_PASS;
+                       } else {
+                               return '' == $this->mPassword ? self::EMPTY_PASS : self::WRONG_PASS;
+                       }
+               } else {        
+                       $wgAuth->updateUser( $u );
+                       $wgUser = $u;
 
-               $up = new UserUpdate();
-               array_push( $wgDeferredUpdateList, $up );
+                       return self::SUCCESS;
+               }
+       }
+       
+       function processLogin() {
+               global $wgUser, $wgAuth;
 
-               if( $this->hasSessionCookie() ) {
-                       return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
-               } else {
-                       return $this->cookieRedirectCheck( 'login' );
+               switch ($this->authenticateUserData())
+               {
+                       case self::SUCCESS:
+                               # We've verified now, update the real record
+                               if( (bool)$this->mRemember != (bool)$wgUser->getOption( 'rememberpassword' ) ) {
+                                       $wgUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
+                                       $wgUser->saveSettings();
+                               } else {
+                                       $wgUser->invalidateCache();
+                               }
+                               $wgUser->setCookies();
+
+                               if( $this->hasSessionCookie() ) {
+                                       return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
+                               } else {
+                                       return $this->cookieRedirectCheck( 'login' );
+                               }
+                               break;
+
+                       case self::NO_NAME:
+                       case self::ILLEGAL:
+                               $this->mainLoginForm( wfMsg( 'noname' ) );
+                               break;
+                       case self::WRONG_PLUGIN_PASS:
+                               $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+                               break;
+                       case self::NOT_EXISTS:
+                               $this->mainLoginForm( wfMsg( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
+                               break;
+                       case self::WRONG_PASS:
+                               $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+                               break;
+                       case self::EMPTY_PASS:
+                               $this->mainLoginForm( wfMsg( 'wrongpasswordempty' ) );
+                               break;
+                       case self::RESET_PASS:
+                               $this->resetLoginForm( wfMsg( 'resetpass_announce' ) );
+                               break;
+                       default:
+                               wfDebugDieBacktrace( "Unhandled case value" );
                }
        }
+       
+       function resetLoginForm( $error ) {
+               global $wgOut;
+               $wgOut->addWikiText( "<div class=\"errorbox\">$error</div>" );
+               $reset = new PasswordResetForm( $this->mName, $this->mPassword );
+               $reset->execute();
+       }
 
        /**
-        * @access private
+        * @private
         */
        function mailPassword() {
-               global $wgUser, $wgDeferredUpdateList, $wgOutputEncoding;
-               global $wgCookiePath, $wgCookieDomain, $wgDBname;
+               global $wgUser, $wgOut, $wgAuth;
+               
+               if( !$wgAuth->allowPasswordChange() ) {
+                       $this->mainLoginForm( wfMsg( 'resetpass_forbidden' ) );
+                       return;
+               }
+               
+               # Check against blocked IPs
+               # fixme -- should we not?
+               if( $wgUser->isBlocked() ) {
+                       $this->mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
+                       return;
+               }
+               
+               # Check against the rate limiter
+               if( $wgUser->pingLimiter( 'mailpassword' ) ) {
+                       $wgOut->rateLimited();
+                       return;
+               }
 
                if ( '' == $this->mName ) {
                        $this->mainLoginForm( wfMsg( 'noname' ) );
@@ -272,237 +487,249 @@ class LoginForm {
                        $this->mainLoginForm( wfMsg( 'noname' ) );
                        return;
                }
-               $id = $u->idForName();
-               if ( 0 == $id ) {
+               if ( 0 == $u->getID() ) {
                        $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
                        return;
                }
-               $u->setId( $id );
-               $u->loadFromDatabase();
 
-               $error = $this->mailPasswordInternal( $u );
-               if ($error === '') {
-                       $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
-               } else {
-                       $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+               # Check against password throttle
+               if ( $u->isPasswordReminderThrottled() ) {
+                       global $wgPasswordReminderResendTime;
+                       # Round the time in hours to 3 d.p., in case someone is specifying minutes or seconds.
+                       $this->mainLoginForm( wfMsg( 'throttled-mailpassword', 
+                               round( $wgPasswordReminderResendTime, 3 ) ) );
+                       return;
                }
 
+               $result = $this->mailPasswordInternal( $u, true );
+               if( WikiError::isError( $result ) ) {
+                       $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
+               } else {
+                       $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ), 'success' );
+               }
        }
 
 
        /**
-        * @access private
+        * @return mixed true on success, WikiError on failure
+        * @private
         */
-       function mailPasswordInternal( $u ) {
-               global $wgDeferredUpdateList, $wgOutputEncoding;
-               global $wgPasswordSender, $wgDBname, $wgIP;
-               global $wgCookiePath, $wgCookieDomain;
+       function mailPasswordInternal( $u, $throttle = true ) {
+               global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
+               global $wgServer, $wgScript;
 
                if ( '' == $u->getEmail() ) {
-                       return wfMsg( 'noemail', $u->getName() );
+                       return new WikiError( wfMsg( 'noemail', $u->getName() ) );
                }
-               $np = User::randomPassword();
-               $u->setNewpassword( $np );
 
-               setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+               $np = $u->randomPassword();
+               $u->setNewpassword( $np, $throttle );
+
+               setcookie( "{$wgCookiePrefix}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain, $wgCookieSecure );
+
                $u->saveSettings();
 
-               $ip = $wgIP;
+               $ip = wfGetIP();
                if ( '' == $ip ) { $ip = '(Unknown)'; }
 
-               $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
+               $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np, $wgServer . $wgScript );
 
-               $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindertitle' ), $m );
-               
-               return htmlspecialchars( $error );
+               $result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m );
+               return $result;
        }
 
 
        /**
-        * @access private
+        * @param string $msg Message that will be shown on success
+        * @param bool $auto Toggle auto-redirect to main page; default true
+        * @private
         */
-       function successfulLogin( $msg ) {
+       function successfulLogin( $msg, $auto = true ) {
                global $wgUser;
-               global $wgDeferredUpdateList;
                global $wgOut;
 
+               # Run any hooks; ignore results
+
+               wfRunHooks('UserLoginComplete', array(&$wgUser));
+
                $wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
                $wgOut->addWikiText( $msg );
-               $wgOut->returnToMain();
+               if ( !empty( $this->mReturnTo ) ) {
+                       $wgOut->returnToMain( $auto, $this->mReturnTo );
+               } else {
+                       $wgOut->returnToMain( $auto );
+               }
        }
 
+       /** */
        function userNotPrivilegedMessage() {
-               global $wgOut, $wgUser, $wgLang;
-               
+               global $wgOut;
+
                $wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
                $wgOut->addWikiText( wfMsg( 'whitelistacctext' ) );
+
+               $wgOut->returnToMain( false );
+       }
+
+       /** */
+       function userBlockedMessage() {
+               global $wgOut;
+
+               # Let's be nice about this, it's likely that this feature will be used
+               # for blocking large numbers of innocent people, e.g. range blocks on 
+               # schools. Don't blame it on the user. There's a small chance that it 
+               # really is the user's fault, i.e. the username is blocked and they 
+               # haven't bothered to log out before trying to create an account to 
+               # evade it, but we'll leave that to their guilty conscience to figure
+               # out.
                
+               $wgOut->setPageTitle( wfMsg( 'cantcreateaccounttitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setArticleRelated( false );
+
+               $ip = wfGetIP();
+               $wgOut->addWikiText( wfMsg( 'cantcreateaccounttext', $ip ) );
                $wgOut->returnToMain( false );
        }
 
        /**
-        * @access private
+        * @private
         */
-       function mainLoginForm( $err ) {
-               global $wgUser, $wgOut, $wgLang;
-               global $wgDBname, $wgAllowRealName;
-
-               $le = wfMsg( 'loginerror' );
-               $yn = wfMsg( 'yourname' );
-               $yp = wfMsg( 'yourpassword' );
-               $ypa = wfMsg( 'yourpasswordagain' );
-               $rmp = wfMsg( 'remembermypassword' );
-               $nuo = wfMsg( 'newusersonly' );
-               $li = wfMsg( 'login' );
-               $ca = wfMsg( 'createaccount' );
-               $cam = wfMsg( 'createaccountmail' );
-               $ye = wfMsg( 'youremail' );
-               if( $wgAllowRealName ) {
-                   $yrn = wfMsg( 'yourrealname' );
-               } else {
-                   $yrn = '';
-               }
-               $efl = wfMsg( 'emailforlost' );
-               $mmp = wfMsg( 'mailmypassword' );
-               $endText = wfMsg( 'loginend' );
-
-               if ( $endText == '&lt;loginend&gt;' ) {
-                       $endText = '';
+       function mainLoginForm( $msg, $msgtype = 'error' ) {
+               global $wgUser, $wgOut, $wgAllowRealName, $wgEnableEmail;
+               global $wgCookiePrefix, $wgAuth, $wgLoginLanguageSelector;
+               global $wgAuth;
+
+               if ( $this->mType == 'signup' ) {
+                       if ( !$wgUser->isAllowed( 'createaccount' ) ) {
+                               $this->userNotPrivilegedMessage();
+                               return;
+                       } elseif ( $wgUser->isBlockedFromCreateAccount() ) {
+                               $this->userBlockedMessage();
+                               return;
+                       }
                }
 
                if ( '' == $this->mName ) {
-                       if ( 0 != $wgUser->getID() ) {
+                       if ( $wgUser->isLoggedIn() ) {
                                $this->mName = $wgUser->getName();
                        } else {
-                               $this->mName = @$_COOKIE[$wgDBname.'UserName'];
+                               $this->mName = isset( $_COOKIE[$wgCookiePrefix.'UserName'] ) ? $_COOKIE[$wgCookiePrefix.'UserName'] : null;
                        }
                }
 
-               $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
-               $wgOut->setRobotpolicy( 'noindex,nofollow' );
-               $wgOut->setArticleRelated( false );
+               $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
 
-               if ( '' == $err ) {
-                       $lp = wfMsg( 'loginprompt' );
-                       $wgOut->addHTML( "<h2>$li:</h2>\n<p>$lp</p>" );
+               if ( $this->mType == 'signup' ) {
+                       $template = new UsercreateTemplate();
+                       $q = 'action=submitlogin&type=signup';
+                       $linkq = 'type=login';
+                       $linkmsg = 'gotaccount';
                } else {
-                       $wgOut->addHTML( "<h2>$le:</h2>\n<font size='+1' 
-       color='red'>$err</font>\n" );
+                       $template = new UserloginTemplate();
+                       $q = 'action=submitlogin&type=login';
+                       $linkq = 'type=signup';
+                       $linkmsg = 'nologin';
                }
-               if ( 1 == $wgUser->getOption( 'rememberpassword' ) ) {
-                       $checked = ' checked';
-               } else {
-                       $checked = '';
+
+               if ( !empty( $this->mReturnTo ) ) {
+                       $returnto = '&returnto=' . wfUrlencode( $this->mReturnTo );
+                       $q .= $returnto;
+                       $linkq .= $returnto;
                }
                
-               $q = 'action=submit';
-               if ( !empty( $this->mReturnto ) ) {
-                       $q .= '&returnto=' . wfUrlencode( $this->mReturnto );
+               # Pass any language selection on to the mode switch link
+               if( $wgLoginLanguageSelector && $this->mLanguage )
+                       $linkq .= '&uselang=' . $this->mLanguage;
+
+               $link = '<a href="' . htmlspecialchars ( $titleObj->getLocalUrl( $linkq ) ) . '">';
+               $link .= wfMsgHtml( $linkmsg . 'link' );
+               $link .= '</a>';
+
+               # Don't show a "create account" link if the user can't
+               if( $this->showCreateOrLoginLink( $wgUser ) )
+                       $template->set( 'link', wfMsgHtml( $linkmsg, $link ) );
+               else
+                       $template->set( 'link', '' );
+               
+               $template->set( 'header', '' );
+               $template->set( 'name', $this->mName );
+               $template->set( 'password', $this->mPassword );
+               $template->set( 'retype', $this->mRetype );
+               $template->set( 'email', $this->mEmail );
+               $template->set( 'realname', $this->mRealName );
+               $template->set( 'domain', $this->mDomain );
+
+               $template->set( 'action', $titleObj->getLocalUrl( $q ) );
+               $template->set( 'message', $msg );
+               $template->set( 'messagetype', $msgtype );
+               $template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() );
+               $template->set( 'userealname', $wgAllowRealName );
+               $template->set( 'useemail', $wgEnableEmail );
+               $template->set( 'canreset', $wgAuth->allowPasswordChange() );
+               $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember  );
+                               
+               # Prepare language selection links as needed
+               if( $wgLoginLanguageSelector ) {
+                       $template->set( 'languages', $this->makeLanguageSelector() );
+                       if( $this->mLanguage )
+                               $template->set( 'uselang', $this->mLanguage );
                }
                
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
-               $action = $titleObj->escapeLocalUrl( $q );
-
-               $encName = htmlspecialchars( $this->mName );
-               $encPassword = htmlspecialchars( $this->mPassword );
-               $encRetype = htmlspecialchars( $this->mRetype );
-               $encEmail = htmlspecialchars( $this->mEmail );
-               $encRealName = htmlspecialchars( $this->mRealName );
-
-               if ($wgUser->getID() != 0) {
-                       $cambutton = "<input tabindex='6' type='submit' name=\"wpCreateaccountMail\" value=\"{$cam}\" />";
+               // Give authentication and captcha plugins a chance to modify the form
+               $wgAuth->modifyUITemplate( $template );
+               if ( $this->mType == 'signup' ) {
+                       wfRunHooks( 'UserCreateForm', array( &$template ) );
                } else {
-                       $cambutton = '';
-               }
-
-               $wgOut->addHTML( "
-       <form name=\"userlogin\" id=\"userlogin\" method=\"post\" action=\"{$action}\">
-       <table border='0'><tr>
-       <td align='right'>$yn:</td>
-       <td align='left'>
-       <input tabindex='1' type='text' name=\"wpName\" value=\"{$encName}\" size='20' />
-       </td>
-       <td align='left'>
-       <input tabindex='3' type='submit' name=\"wpLoginattempt\" value=\"{$li}\" />
-       </td>
-       </tr>
-       <tr>
-       <td align='right'>$yp:</td>
-       <td align='left'>
-       <input tabindex='2' type='password' name=\"wpPassword\" value=\"{$encPassword}\" size='20' />
-       </td>
-       <td align='left'>
-       <input tabindex='4' type='checkbox' name=\"wpRemember\" value=\"1\" id=\"wpRemember\"$checked /><label for=\"wpRemember\">$rmp</label>
-       </td>
-       </tr>");
-
-               if ($wgUser->isAllowedToCreateAccount()) {
-                       $encRetype = htmlspecialchars( $this->mRetype );
-                       $encEmail = htmlspecialchars( $this->mEmail );
-       $wgOut->addHTML("<tr><td colspan='3'>&nbsp;</td></tr><tr>
-       <td align='right'>$ypa:</td>
-       <td align='left'>
-       <input tabindex='5' type='password' name=\"wpRetype\" value=\"{$encRetype}\" 
-       size='20' />
-       </td><td>$nuo</td></tr>
-       <tr>
-       <td align='right'>$ye:</td>
-       <td align='left'>
-       <input tabindex='7' type='text' name=\"wpEmail\" value=\"{$encEmail}\" size='20' />
-       </td>");
-                   
-       if ($wgAllowRealName) {
-           $wgOut->addHTML("<td>&nbsp;</td>
-                             </tr><tr>
-                            <td align='right'>$yrn:</td>
-                            <td align='left'>
-                             <input tabindex='8' type='text' name=\"wpRealName\" value=\"{$encRealName}\" size='20' />
-                             </td>");
+                       wfRunHooks( 'UserLoginForm', array( &$template ) );
+               }
+
+               $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setArticleRelated( false );
+               $wgOut->addTemplate( $template );
        }
-                   
-       $wgOut->addHTML("<td align='left'>
-       <input tabindex='9' type='submit' name=\"wpCreateaccount\" value=\"{$ca}\" />
-       $cambutton
-       </td></tr>");
-               }
-           
-               $wgOut->addHTML("
-       <tr><td colspan='3'>&nbsp;</td></tr><tr>
-       <td colspan='3' align='left'>
-       <p>$efl<br />
-       <input tabindex='10' type='submit' name=\"wpMailmypassword\" value=\"{$mmp}\" /></p>
-       </td></tr></table>
-       </form>\n" );
-               $wgOut->addHTML( $endText );
+       
+       /**
+        * @private
+        */
+       function showCreateOrLoginLink( &$user ) {
+               if( $this->mType == 'signup' ) {
+                       return( true );
+               } elseif( $user->isAllowed( 'createaccount' ) ) {
+                       return( true );
+               } else {
+                       return( false );
+               }
        }
 
        /**
-        * @access private
+        * @private
         */
        function hasSessionCookie() {
                global $wgDisableCookieCheck;
-               return ( $wgDisableCookieCheck ) ? true : ( '' != $_COOKIE[session_name()] );
+               return ( $wgDisableCookieCheck ) ? true : ( isset( $_COOKIE[session_name()] ) );
        }
-         
+
        /**
-        * @access private
+        * @private
         */
        function cookieRedirectCheck( $type ) {
-               global $wgOut, $wgLang;
+               global $wgOut;
 
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+               $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
                $check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
 
                return $wgOut->redirect( $check );
        }
 
        /**
-        * @access private
+        * @private
         */
        function onCookieRedirectCheck( $type ) {
                global $wgUser;
@@ -522,12 +749,54 @@ class LoginForm {
        }
 
        /**
-        * @access private
+        * @private
         */
        function throttleHit( $limit ) {
                global $wgOut;
 
                $wgOut->addWikiText( wfMsg( 'acct_creation_throttle_hit', $limit ) );
        }
+       
+       /**
+        * Produce a bar of links which allow the user to select another language
+        * during login/registration but retain "returnto"
+        *
+        * @return string
+        */
+       function makeLanguageSelector() {
+               $msg = wfMsgForContent( 'loginlanguagelinks' );
+               if( $msg != '' && !wfEmptyMsg( 'loginlanguagelinks', $msg ) ) {
+                       $langs = explode( "\n", $msg );
+                       $links = array();
+                       foreach( $langs as $lang ) {
+                               $lang = trim( $lang, '* ' );
+                               $parts = explode( '|', $lang );
+                               $links[] = $this->makeLanguageSelectorLink( $parts[0], $parts[1] );
+                       }
+                       return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', implode( ' | ', $links ) ) : '';
+               } else {
+                       return '';
+               }
+       }
+       
+       /**
+        * Create a language selector link for a particular language
+        * Links back to this page preserving type and returnto
+        *
+        * @param $text Link text
+        * @param $lang Language code
+        */
+       function makeLanguageSelectorLink( $text, $lang ) {
+               global $wgUser;
+               $self = SpecialPage::getTitleFor( 'Userlogin' );
+               $attr[] = 'uselang=' . $lang;
+               if( $this->mType == 'signup' )
+                       $attr[] = 'type=signup';
+               if( $this->mReturnTo )
+                       $attr[] = 'returnto=' . $this->mReturnTo;
+               $skin =& $wgUser->getSkin();
+               return $skin->makeKnownLinkObj( $self, htmlspecialchars( $text ), implode( '&', $attr ) );
+       }
+       
 }
 ?>