* Fixed a typo
[lhc/web/wiklou.git] / includes / SpecialUserlogin.php
index fbe1e50..7b5fea8 100644 (file)
-<?
-
-function wfSpecialUserlogin()
-{
-       global $wpCreateaccount, $wpCreateaccountMail;
-       global $wpLoginattempt, $wpMailmypassword;
-       global $action, $_REQUEST;
-
-       $fields = array( "wpName", "wpPassword", "wpName",
-         "wpPassword", "wpRetype", "wpEmail" );
-       wfCleanFormFields( $fields );
-
-        $wpCookieCheck = $_REQUEST[ "wpCookieCheck" ];
-
-       if ( isset( $wpCookieCheck ) ) {
-                onCookieRedirectCheck( $wpCookieCheck );
-        } else if ( isset( $wpCreateaccount ) ) {
-               addNewAccount();
-       } else if ( isset( $wpCreateaccountMail ) ) {
-               addNewAccountMailPassword();
-       } else if ( isset( $wpMailmypassword ) ) {
-               mailPassword();
-       } else if ( "submit" == $action || isset( $wpLoginattempt ) ) {
-               processLogin();
-       } else {
-               mainLoginForm( "" );
+<?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ * constructor
+ */
+function wfSpecialUserlogin() {
+       global $wgCommandLineMode;
+       global $wgRequest;
+       if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] )  ) {
+               User::SetupSession();
        }
+       
+       $form = new LoginForm( $wgRequest );
+       $form->execute();
 }
 
-
-/* private */ function addNewAccountMailPassword()
-{
-       global $wgOut, $wpEmail, $wpName;
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class LoginForm {
+       var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
+       var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
+       var $mLoginattempt, $mRemember, $mEmail;
        
-       if ("" == $wpEmail) {
-               mainLoginForm( wfMsg( "noemail", $wpName ) );
-               return;
-       }
-
-       $u = addNewaccountInternal();
-
-       if ($u == NULL) {
-               return;
+       /**
+        * Constructor
+        * @param webrequest $request A webrequest object passed by reference
+        */
+       function LoginForm( &$request ) {
+               global $wgLang, $wgAllowRealName, $wgEnableEmail;
+               global $wgEmailAuthentication;
+
+               $this->mName = $request->getText( 'wpName' );
+               $this->mPassword = $request->getText( 'wpPassword' );
+               $this->mRetype = $request->getText( 'wpRetype' );
+               $this->mReturnto = $request->getVal( 'returnto' );
+               $this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
+               $this->mPosted = $request->wasPosted();
+               $this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
+               $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' );
+               
+               if( $wgEnableEmail ) {
+                       $this->mEmail = $request->getText( 'wpEmail' );
+               } else {
+                       $this->mEmail = '';
+               }
+               if( $wgAllowRealName ) {
+                   $this->mRealName = $request->getText( 'wpRealName' );
+               } else {
+                   $this->mRealName = '';
+               }
+           
+               # When switching accounts, it sucks to get automatically logged out
+               if( $this->mReturnto == $wgLang->specialPage( 'Userlogout' ) ) {
+                       $this->mReturnto = '';
+               }
        }
 
-       $u->saveSettings();
-       if (mailPasswordInternal($u) == NULL)
-       {
-               return;  
+       function execute() {
+               if ( !is_null( $this->mCookieCheck ) ) {
+                       $this->onCookieRedirectCheck( $this->mCookieCheck );
+                       return;
+               } else if( $this->mPosted ) {
+                       if( $this->mCreateaccount ) {
+                               return $this->addNewAccount();
+                       } else if ( $this->mCreateaccountMail ) {
+                               return $this->addNewAccountMailPassword();
+                       } else if ( $this->mMailmypassword ) {
+                               return $this->mailPassword();
+                       } else if ( ( 'submitlogin' == $this->mAction ) || $this->mLoginattempt ) {
+                               return $this->processLogin();
+                       }
+               }
+               $this->mainLoginForm( '' );
        }
 
-       $wgOut->setPageTitle( wfMsg( "accmailtitle" ) );
-       $wgOut->setRobotpolicy( "noindex,nofollow" );
-       $wgOut->setArticleFlag( false );
+       /**
+        * @access private
+        */
+       function addNewAccountMailPassword() {
+               global $wgOut;
+               global $wgEmailAuthentication;
+               
+               if ('' == $this->mEmail) {
+                       $this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
+                       return;
+               }
 
-       $wgOut->addWikiText( wfMsg( "accmailtext", $u->getName(), $u->getEmail() ) );
-       $wgOut->returnToMain( false );
+               $u = $this->addNewaccountInternal();
 
-       $u = 0;
-}
+               if ($u == NULL) {
+                       return;
+               }
 
+               $newadr = strtolower($this->mEmail);
 
-/* private */ function addNewAccount()
-{
-       global $wgUser, $wgOut, $wpPassword, $wpRetype, $wpName, $wpRemember;
-       global $wpEmail, $wgDeferredUpdateList;
+               # prepare for authentication and mail a temporary password to newadr
+               if ( !$u->isValidEmailAddr( $newadr ) ) {
+                       return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+               }
+               $u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+               $u->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated
 
-       $u = addNewAccountInternal();
+               if ($wgEmailAuthentication) {
+                       $error = $this->mailPasswordInternal( $u, true, $dummy ); # mail a temporary password to the dirty address
+               }
 
-       if ($u == NULL) {
-               return;
+               $wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setArticleRelated( false );
+       
+               if ($wgEmailAuthentication) {
+                       if ($error === '') {
+                               return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) );
+               } else {
+                               return $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+               }
+                       # if user returns, that new email address gets authenticated in checkpassword()
+               }
+#              if ( $error === '' ) {
+#                      $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
+#                      $wgOut->returnToMain( false );
+#              } else {
+#                      $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+#              }
+               $u = 0;
        }
 
-       $wgUser = $u;
-        $wgUser->setCookies();
-
-        $up = new UserUpdate();
-        array_push( $wgDeferredUpdateList, $up );
-  
-        if (hasSessionCookie()) {
-            return successfulLogin( wfMsg( "welcomecreation", $wgUser->getName() ) );
-        } else {
-            return cookieRedirectCheck("new");
-        }
-}
 
+       /**
+        * @access private
+        */
+       function addNewAccount() {
+               global $wgUser, $wgOut;
+               global $wgEmailAuthentication;
 
-/* private */ function addNewAccountInternal()
-{
-       global $wgUser, $wgOut, $wpPassword, $wpRetype, $wpName, $wpRemember;
-       global $wpEmail;
+               $u = $this->addNewAccountInternal();
 
-       if (!$wgUser->isAllowedToCreateAccount()) {
-               userNotPrivilegedMessage();
-               return;
-       }
+               if ($u == NULL) {
+                       return;
+               }
 
-       if ( 0 != strcmp( $wpPassword, $wpRetype ) ) {
-               mainLoginForm( wfMsg( "badretype" ) );
-               return;
-       }
-       $wpName = trim( $wpName );
-       if ( ( "" == $wpName ) ||
-         preg_match( "/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}/", $wpName ) ||
-         (strpos( $wpName, "/" ) !== false) ) 
-       {
-               mainLoginForm( wfMsg( "noname" ) );
-               return;
-       }
-       if ( wfReadOnly() ) {
-               $wgOut->readOnlyPage();
-               return;
-       }
-       $u = User::newFromName( $wpName );
+               $newadr = strtolower($this->mEmail);
+               if ($newadr != '') {            # prepare for authentication and mail a temporary password to newadr
+                       if ( !$u->isValidEmailAddr( $newadr ) ) {
+                               return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+                       }
+                       $u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+                       $u->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated
+
+                       if ($wgEmailAuthentication) {
+                               # mail a temporary password to the dirty address
+
+                               $error = $this->mailPasswordInternal( $u, true, $dummy );
+                               if ($error === '') {
+                                       return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) );
+                               } else {
+                                       return $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+                               }
+                               # if user returns, that new email address gets authenticated in checkpassword()
+                       }
+               }
 
-       if ( 0 != $u->idForName() ) {
-               mainLoginForm( wfMsg( "userexists" ) );
-               return;
+               $wgUser = $u;
+               $wgUser->setCookies();
+
+               $wgUser->saveSettings();
+
+               if( $this->hasSessionCookie() ) {
+                       return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
+               } else {
+                       return $this->cookieRedirectCheck( 'new' );
+               }
        }
-       $u->addToDatabase();
-       $u->setPassword( $wpPassword );
-       $u->setEmail( $wpEmail );
-       if ( 1 == $wpRemember ) { $r = 1; }
-       else { $r = 0; }
-       $u->setOption( "rememberpassword", $r );
-       
-       return $u;
-}
 
+       /**
+        * @access private
+        */
+       function addNewAccountInternal() {
+               global $wgUser, $wgOut;
+               global $wgMaxNameChars;
+               global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
+               global $wgMinimalPasswordLength;
+
+               if (!$wgUser->isAllowedToCreateAccount()) {
+                       $this->userNotPrivilegedMessage();
+                       return false;
+               }
 
+               if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
+                       $this->mainLoginForm( wfMsg( 'badretype' ) );
+                       return false;
+               }
+               
+               $name = trim( $this->mName );
+               $u = User::newFromName( $name );
+               if ( is_null( $u ) ||
+                 ( '' == $name ) ||
+                 $wgUser->isIP( $name ) ||
+                 (strpos( $name, '/' ) !== false) ||
+                 (strlen( $name ) > $wgMaxNameChars) ||
+                 ucFirst($name) != $u->getName() ) 
+               {
+                       $this->mainLoginForm( wfMsg( 'noname' ) );
+                       return false;
+               }
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+                       return false;
+               }
+               
+               if ( 0 != $u->idForName() ) {
+                       $this->mainLoginForm( wfMsg( 'userexists' ) );
+                       return false;
+               }
 
+               if ( strlen( $this->mPassword ) < $wgMinimalPasswordLength ) {
+                       $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+                       return false;
+               }
 
-/* private */ function processLogin()
-{
-       global $wgUser, $wpName, $wpPassword, $wpRemember;
-        global $wgDeferredUpdateList;
-       global $returnto;
+               if ( $wgAccountCreationThrottle ) {
+                       $key = $wgDBname.':acctcreate:ip:'.$wgIP;
+                       $value = $wgMemc->incr( $key );
+                       if ( !$value ) {
+                               $wgMemc->set( $key, 1, 86400 );
+                       }
+                       if ( $value > $wgAccountCreationThrottle ) {
+                               $this->throttleHit( $wgAccountCreationThrottle );
+                               return false;
+                       }
+               }
 
-       if ( "" == $wpName ) {
-               mainLoginForm( wfMsg( "noname" ) );
-               return;
+               return $this->initUser( $u );
        }
-       $u = User::newFromName( $wpName );
-       $id = $u->idForName();
-       if ( 0 == $id ) {
-               mainLoginForm( wfMsg( "nosuchuser", $u->getName() ) );
-               return;
+       
+       /**
+        * Actually add a user to the database.
+        * Give it a User object that has been initialised with a name.
+        *
+        * @param User $u
+        * @return User
+        * @access 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 );
+
+               if ( $this->mRemember ) { $r = 1; }
+               else { $r = 0; }
+               $u->setOption( 'rememberpassword', $r );
+               
+               return $u;
        }
-       $u->setId( $id );
-       $u->loadFromDatabase();
-       $ep = $u->encryptPassword( $wpPassword );
-       if ( 0 != strcmp( $ep, $u->getPassword() ) ) {
-               if ( 0 != strcmp( $ep, $u->getNewpassword() ) ) {
-                       mainLoginForm( wfMsg( "wrongpassword" ) );
+
+       /**
+        * @access private
+        */
+       function processLogin() {
+               global $wgUser, $wgLang;
+               global $wgEmailAuthentication;
+
+               if ( '' == $this->mName ) {
+                       $this->mainLoginForm( wfMsg( 'noname' ) );
                        return;
                }
-       }
+               $u = User::newFromName( $this->mName );
+               if( is_null( $u ) ) {
+                       $this->mainLoginForm( wfMsg( 'noname' ) );
+                       return;
+               }
+               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 {
+                                       $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+                                       return;
+                               }
+                       } else {
+                               $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
+                               return;
+                       }
+               } else {
+                       $u->loadFromDatabase();
+               }
 
-       # We've verified now, update the real record
-       #
-       if ( 1 == $wpRemember ) {
-               $r = 1;
-               $u->setCookiePassword( $wpPassword );
-       } else {
-               $r = 0;
-       }
-       $u->setOption( "rememberpassword", $r );
-
-       $wgUser = $u;
-        $wgUser->setCookies();
-
-        $up = new UserUpdate();
-        array_push( $wgDeferredUpdateList, $up );
-  
-        if (hasSessionCookie()) {
-           return successfulLogin( wfMsg( "loginsuccess", $wgUser->getName() ) );
-        } else {
-            return cookieRedirectCheck( "login" );
-        }
-}
+               # store temporarily the status before the password check is performed
+               $mailmsg = '';
+               $oldadr = strtolower($u->getEmail());
+               $newadr = strtolower($this->mEmail);
+               $alreadyauthenticated = (( $u->mEmailAuthenticationtimestamp != 0 ) || ($oldadr == '')) ;
 
-/* private */ function mailPassword()
-{
-       global $wgUser, $wpName, $wgDeferredUpdateList, $wgOutputEncoding;
-       global $wgCookiePath, $wgCookieDomain, $wgDBname;
+               # checkPassword sets EmailAuthenticationtimestamp, if the newPassword is used
 
-       if ( "" == $wpName ) {
-               mainLoginForm( wfMsg( "noname" ) );
-               return;
-       }
-       $u = User::newFromName( $wpName );
-       $id = $u->idForName();
-       if ( 0 == $id ) {
-               mainLoginForm( wfMsg( "nosuchuser", $u->getName() ) );
-               return;
-       }
-       $u->setId( $id );
-       $u->loadFromDatabase();
+               if (!$u->checkPassword( $this->mPassword )) {
+                       $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+                       return;
+               }
 
-       if (mailPasswordInternal($u) == NULL) {
-               return;
-       }
+               # We've verified now, update the real record
+               #
+               if ( $this->mRemember ) {
+                       $r = 1;
+               } else {
+                       $r = 0;
+               }
+               $u->setOption( 'rememberpassword', $r );
 
-       mainLoginForm( wfMsg( "passwordsent", $u->getName() ) );
-}
+               /* check if user with correct password has entered a new email address */
+               if (($newadr <> '') && ($newadr <> $oldadr)) { # the user supplied a new email address on the login page
 
+                       # prepare for authentication and mail a temporary password to newadr
+                       if ( !$u->isValidEmailAddr( $newadr ) ) {
+                               return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+                       }
+                       $u->mEmail = $newadr; # new behaviour: store this new emailaddr from login-page now into user database record ...
+                       $u->mEmailAuthenticationtimestamp = 0; # ... but flag the address as "dirty" (unauthenticated)
+                       $alreadyauthenticated = false;
 
-/* private */ function mailPasswordInternal( $u )
-{
-       global $wpName, $wgDeferredUpdateList, $wgOutputEncoding;
-       global $wgPasswordSender;
+                       if ($wgEmailAuthentication) {
 
-       if ( "" == $u->getEmail() ) {
-               mainLoginForm( wfMsg( "noemail", $u->getName() ) );
-               return;
-       }
-       $np = User::randomPassword();
-       $u->setNewpassword( $np );
+                               # mail a temporary one-time password to the dirty address and return here to complete the user login
+                               # if the user returns now or later using this temp. password, then the new email address $newadr
+                               # - which is already stored in his user record - gets authenticated in checkpassword()
 
-       setcookie( "{$wgDBname}Password", "", time() - 3600, $wgCookiePath, $wgCookieDomain );
-       $u->saveSettings();
+                               $error = $this->mailPasswordInternal( $u, false, $newpassword_temp);
+                               $u->mNewpassword = $newpassword_temp;
 
-       $ip = getenv( "REMOTE_ADDR" );
-       if ( "" == $ip ) { $ip = "(Unknown)"; }
+                               #       The temporary password is mailed. The user is logged-in as he entered his correct password
+                               #       This appears to be more intuitive than alternative 2.
 
-       $m = wfMsg( "passwordremindertext", $ip, $u->getName(), $np );
+                               if ($error === '') {
+                                       $mailmsg = '<br />' . wfMsg( 'passwordsentforemailauthentication', $u->getName() );
+                               } else {
+                                       $mailmsg = '<br />' . wfMsg( 'mailerror', $error ) ;
+                               }
+                       }
+               }
 
-       mail( $u->getEmail(), wfMsg( "passwordremindertitle" ), $m,
-         "MIME-Version: 1.0\r\n" .
-         "Content-type: text/plain; charset={$wgOutputEncoding}\r\n" .
-         "Content-transfer-encoding: 8bit\r\n" .
-         "From: $wgPasswordSender" );
-         
-       return $u;
-}
+               $wgUser = $u;
+               $wgUser->setCookies();
+
+               # save all settings (incl. new email address and/or temporary password, if applicable)
+               $wgUser->saveSettings();
+               
+               if ( !$wgEmailAuthentication || $alreadyauthenticated ) {
+                       $authenticated = '';
+                       $mailmsg = '';
+               } elseif ($u->mEmailAuthenticationtimestamp != 0) {
+                               $authenticated = ' ' . wfMsg( 'emailauthenticated', $wgLang->timeanddate( $u->mEmailAuthenticationtimestamp, true ) );
+                       } else {
+                               $authenticated = ' ' . wfMsg( 'emailnotauthenticated' );
+                       }
+
+               if( $this->hasSessionCookie() ) {
+                       return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) . $authenticated .  $mailmsg );
+               } else {
+                       return $this->cookieRedirectCheck( 'login' );
+               }
+       }
 
+       /**
+        * @access private
+        */
+       function mailPassword() {
+               global $wgUser, $wgDeferredUpdateList, $wgOutputEncoding;
+               global $wgCookiePath, $wgCookieDomain, $wgDBname;
 
+               if ( '' == $this->mName ) {
+                       $this->mainLoginForm( wfMsg( 'noname' ) );
+                       return;
+               }
+               $u = User::newFromName( $this->mName );
+               if( is_null( $u ) ) {
+                       $this->mainLoginForm( wfMsg( 'noname' ) );
+                       return;
+               }
+               if ( 0 == $u->getID() ) {
+                       $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
+                       return;
+               }
 
+               $u->loadFromDatabase();
 
+               $error = $this->mailPasswordInternal( $u, true, $dummy );
+               if ($error === '') {
+                       $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
+               } else {
+                       $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+               }
+               return;
+       }
 
-/* private */ function successfulLogin( $msg )
-{
-  global $wgUser;
-  global $wgDeferredUpdateList;
-  global $wgOut, $returnto;
 
-  $wgOut->setPageTitle( wfMsg( "loginsuccesstitle" ) );
-  $wgOut->setRobotpolicy( "noindex,nofollow" );
-  $wgOut->setArticleFlag( false );
-  $wgOut->addHTML( $msg . "\n<p>" );
-  $wgOut->returnToMain();
-}
+       /**
+        * @access private
+        */
+       function mailPasswordInternal( $u, $savesettings = true, &$newpassword_out ) {
+               global $wgPasswordSender, $wgDBname, $wgIP;
+               global $wgCookiePath, $wgCookieDomain;
 
-function userNotPrivilegedMessage()
-{
-       global $wgOut, $wgUser, $wgLang;
+               if ( '' == $u->getEmail() ) {
+                       return wfMsg( 'noemail', $u->getName() );
+               }
 
-       $wgOut->setPageTitle( wfMsg( "whitelistacctitle" ) );
-       $wgOut->setRobotpolicy( "noindex,nofollow" );
-       $wgOut->setArticleFlag( false );
+               $np = $u->randomPassword();
+               $u->setNewpassword( $np );
 
-       $wgOut->addWikiText( wfMsg( "whitelistacctext" ) );
-       $wgOut->returnToMain( false );
-}
+               # we want to store this new password together with other values in the calling function
+               $newpassword_out = $u->mNewpassword;
 
-/* private */ function mainLoginForm( $err )
-{
-       global $wgUser, $wgOut, $wgLang, $returnto;
-       global $wpName, $wpPassword, $wpRetype, $wpRemember;
-       global $wpEmail, $HTTP_COOKIE_VARS, $wgDBname;
-
-       $le = wfMsg( "loginerror" );
-       $yn = wfMsg( "yourname" );
-       $yp = wfMsg( "yourpassword" );
-       $ypa = wfMsg( "yourpasswordagain" );
-       $rmp = wfMsg( "remembermypassword" );
-       $ayn = wfMsg( "areyounew" );
-       $nuo = wfMsg( "newusersonly" );
-       $li = wfMsg( "login" );
-       $ca = wfMsg( "createaccount" );
-       $cam = wfMsg( "createaccountmail" );
-       $ye = wfMsg( "youremail" );
-       $efl = wfMsg( "emailforlost" );
-       $mmp = wfMsg( "mailmypassword" );
-
-       $name = $wpName;
-       if ( "" == $name ) {
-               if ( 0 != $wgUser->getID() ) {
-                       $name = $wgUser->getName();
-               } else {
-                       $name = $HTTP_COOKIE_VARS["{$wgDBname}UserName"];
+               # WHY IS THIS HERE ? SHOULDN'T IT BE User::setcookie ???
+               setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+
+               if ($savesettings) {
+               $u->saveSettings();
                }
+
+               $ip = $wgIP;
+               if ( '' == $ip ) { $ip = '(Unknown)'; }
+
+               $m = wfMsg( 'passwordremindermailbody', $ip, $u->getName(), wfUrlencode($u->getName()), $np );
+
+               require_once('UserMailer.php');
+               $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindermailsubject' ), $m );
+               
+               return htmlspecialchars( $error );
        }
-       $pwd = $wpPassword;
-
-       $wgOut->setPageTitle( wfMsg( "userlogin" ) );
-       $wgOut->setRobotpolicy( "noindex,nofollow" );
-       $wgOut->setArticleFlag( false );
-
-       if ( "" == $err ) {
-                $lp = wfMsg( "loginprompt" );
-               $wgOut->addHTML( "<h2>$li:</h2>\n<p>$lp</p>" );
-       } else {
-               $wgOut->addHTML( "<h2>$le:</h2>\n<font size='+1' 
-color='red'>$err</font>\n" );
-       }
-       if ( 1 == $wgUser->getOption( "rememberpassword" ) ) {
-               $checked = " checked";
-       } else {
-               $checked = "";
-       }
-       $q = "action=submit";
-       if ( "" != $returnto ) { $q .= "&returnto=" . wfUrlencode($returnto); }
-       $action = wfLocalUrlE( $wgLang->specialPage( "Userlogin" ), $q );
 
-       $wpName = wfEscapeHTML( $wpName );
-       $wpPassword = wfEscapeHTML( $wpPassword );
-       $wpRetype = wfEscapeHTML( $wpRetype );
-       $wpEmail = wfEscapeHTML( $wpEmail );
 
-       if ($wgUser->getID() != 0) {
-               $cambutton = "<input tabindex=6 type=submit name=\"wpCreateaccountMail\" value=\"{$cam}\">";
+       /**
+        * @param string $msg Message that will be shown on success.
+        * @access private
+        */
+       function successfulLogin( $msg ) {
+               global $wgUser;
+               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();
        }
 
-       $wgOut->addHTML( "
-<form name=\"userlogin\" id=\"userlogin\" method=\"post\" action=\"{$action}\">
-<table border=0><tr>
-<td align=right>$yn:</td>
-<td colspan=2 align=left>
-<input tabindex=1 type=text name=\"wpName\" value=\"{$name}\" size=20>
-</td></tr><tr>
-<td align=right>$yp:</td>
-<td align=left>
-<input tabindex=2 type=password name=\"wpPassword\" value=\"{$pwd}\" size=20>
-</td>
-<td align=left>
-<input tabindex=3 type=submit name=\"wpLoginattempt\" value=\"{$li}\">
-</td></tr>");
-
-       if ($wgUser->isAllowedToCreateAccount()) {
-
-$wgOut->addHTML("<tr><td colspan=3>&nbsp;</td></tr><tr>
-<td align=right>$ypa:</td>
-<td align=left>
-<input tabindex=4 type=password name=\"wpRetype\" value=\"{$wpRetype}\" 
-size=20>
-</td><td>$nuo</td></tr>
-<tr>
-<td align=right>$ye:</td>
-<td align=left>
-<input tabindex=5 type=text name=\"wpEmail\" value=\"{$wpEmail}\" size=20>
-</td><td align=left>
-<input tabindex=6 type=submit name=\"wpCreateaccount\" value=\"{$ca}\">
-$cambutton
-</td></tr>");
+       /** */
+       function userNotPrivilegedMessage() {
+               global $wgOut;
+               
+               $wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setArticleRelated( false );
+
+               $wgOut->addWikiText( wfMsg( 'whitelistacctext' ) );
+               
+               $wgOut->returnToMain( false );
        }
 
-       $wgOut->addHTML("
-<tr>
-<td colspan=3 align=left>
-<input tabindex=7 type=checkbox name=\"wpRemember\" value=\"1\" id=\"wpRemember\"$checked><label for=\"wpRemember\">$rmp</label>
-</td></tr>
-<tr><td colspan=3>&nbsp;</td></tr><tr>
-<td colspan=3 align=left>
-<p>$efl<br>
-<input tabindex=8 type=submit name=\"wpMailmypassword\" value=\"{$mmp}\">
-</td></tr></table>
-</form>\n" );
+       /**
+        * @access private
+        */
+       function mainLoginForm( $err ) {
+               global $wgUser, $wgOut, $wgLang;
+               global $wgDBname, $wgAllowRealName, $wgEnableEmail;
+               global $wgEmailAuthentication;
+
+               if ( '' == $this->mName ) {
+                       if ( $wgUser->isLoggedIn() ) {
+                               $this->mName = $wgUser->getName();
+                       } else {
+                               $this->mName = @$_COOKIE[$wgDBname.'UserName'];
+                       }
+               }
 
+               $q = 'action=submitlogin';
+               if ( !empty( $this->mReturnto ) ) {
+                       $q .= '&returnto=' . wfUrlencode( $this->mReturnto );
+               }
+               $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+
+               require_once( 'templates/Userlogin.php' );
+               $template =& new UserloginTemplate();
+               
+               $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( 'action', $titleObj->getLocalUrl( $q ) );
+               $template->set( 'error', $err );
+               $template->set( 'create', $wgUser->isAllowedToCreateAccount() );
+               $template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() );
+               $template->set( 'userealname', $wgAllowRealName );
+               $template->set( 'useemail', $wgEnableEmail );
+               $template->set( 'useemailauthent', $wgEmailAuthentication );
+               $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember  );
+               
+               $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setArticleRelated( false );
+               $wgOut->addTemplate( $template );
+       }
 
+       /**
+        * @access private
+        */
+       function hasSessionCookie() {
+               global $wgDisableCookieCheck;
+               return ( $wgDisableCookieCheck ) ? true : ( '' != $_COOKIE[session_name()] );
+       }
+         
+       /**
+        * @access private
+        */
+       function cookieRedirectCheck( $type ) {
+               global $wgOut, $wgLang;
 
-}
+               $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+               $check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
 
-/* private */ function hasSessionCookie()
-{
-  global $HTTP_COOKIE_VARS;
-  global $wgDisableCookieCheck;
-  
-  return ( $wgDisableCookieCheck ) ? true : ( "" != $HTTP_COOKIE_VARS[session_name()]);
-}
-  
-/* private */ function cookieRedirectCheck( $type )
-{
-  global $wgOut, $wgLang;
+               return $wgOut->redirect( $check );
+       }
 
-  $check = wfLocalUrl( $wgLang->specialPage( "Userlogin" ),
-                       "wpCookieCheck=$type" );
+       /**
+        * @access private
+        */
+       function onCookieRedirectCheck( $type ) {
+               global $wgUser;
+
+               if ( !$this->hasSessionCookie() ) {
+                       if ( $type == 'new' ) {
+                               return $this->mainLoginForm( wfMsg( 'nocookiesnew' ) );
+                       } else if ( $type == 'login' ) {
+                               return $this->mainLoginForm( wfMsg( 'nocookieslogin' ) );
+                       } else {
+                               # shouldn't happen
+                               return $this->mainLoginForm( wfMsg( 'error' ) );
+                       }
+               } else {
+                       return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
+               }
+       }
 
-  return $wgOut->redirect( $check );
-}
+       /**
+        * @access private
+        */
+       function throttleHit( $limit ) {
+               global $wgOut;
 
-/* private */ function onCookieRedirectCheck( $type ) {
-
-  global $wgUser;
-
-  if (!hasSessionCookie()) {
-    if ( $type == "new" ) {
-      return mainLoginForm( wfMsg( "nocookiesnew" ) );
-    } else if ( $type == "login" ) {
-      return mainLoginForm( wfMsg( "nocookieslogin" ) );
-    } else {
-# shouldn't happen
-      return mainLoginForm( wfMsg( "error" ) );
-    }
-  } else {
-    return successfulLogin( wfMsg( "loginsuccess", $wgUser->getName() ) );
-  }
+               $wgOut->addWikiText( wfMsg( 'acct_creation_throttle_hit', $limit ) );
+       }
 }
-
-
 ?>