Corrected spelling error

[lhc/web/wiklou.git] / includes / SpecialUserlogin.php

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 1d72bea..e68f66e 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -20,12 +20,12 @@ class LoginForm {
        var $mLoginattempt, $mRemember, $mEmail;
        
        function LoginForm( &$request ) {
-               global $wgLang;
+               global $wgLang, $wgAllowRealName;
 
                $this->mName = $request->getText( 'wpName' );
                $this->mPassword = $request->getText( 'wpPassword' );
                $this->mRetype = $request->getText( 'wpRetype' );
-               $this->mReturnto = $request->getText( 'returnto' );
+               $this->mReturnto = $request->getVal( 'returnto' );
                $this->mCookieCheck = $request->getVal( "wpCookieCheck" );
                $this->mPosted = $request->wasPosted();
                $this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
@@ -35,7 +35,12 @@ class LoginForm {
                $this->mAction = $request->getVal( 'action' );
                $this->mRemember = $request->getCheck( 'wpRemember' );
                $this->mEmail = $request->getText( 'wpEmail' );
-               
+               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 = "";
@@ -154,6 +159,8 @@ class LoginForm {
                $u->addToDatabase();
                $u->setPassword( $this->mPassword );
                $u->setEmail( $this->mEmail );
+               $u->setRealName( $this->mRealName );
+
                if ( $this->mRemember ) { $r = 1; }
                else { $r = 0; }
                $u->setOption( "rememberpassword", $r );
@@ -298,7 +305,7 @@ class LoginForm {
        /* private */ function mainLoginForm( $err )
        {
                global $wgUser, $wgOut, $wgLang;
-               global $wgDBname;
+               global $wgDBname, $wgAllowRealName;
 
                $le = wfMsg( "loginerror" );
                $yn = wfMsg( "yourname" );
@@ -310,6 +317,11 @@ class LoginForm {
                $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" );
@@ -355,6 +367,7 @@ class LoginForm {
                $encPassword = wfEscapeHTML( $this->mPassword );
                $encRetype = wfEscapeHTML( $this->mRetype );
                $encEmail = wfEscapeHTML( $this->mEmail );
+               $encRealName = wfEscapeHTML( $this->mRealName );
 
                if ($wgUser->getID() != 0) {
                        $cambutton = "<input tabindex='6' type='submit' name=\"wpCreateaccountMail\" value=\"{$cam}\" />";
@@ -395,13 +408,24 @@ class LoginForm {
        <tr>
        <td align='right'>$ye:</td>
        <td align='left'>
-       <input tabindex='5' type='text' name=\"wpEmail\" value=\"{$encEmail}\" size='20' />
-       </td><td align='left'>
-       <input tabindex='6' type='submit' name=\"wpCreateaccount\" value=\"{$ca}\" />
+       <input tabindex='6' 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='6' type='text' name=\"wpRealName\" value=\"{$encRealName}\" size='20' />
+                             </td>");
+       }
+                   
+       $wgOut->addHTML("<td align='left'>
+       <input tabindex='7' type='submit' name=\"wpCreateaccount\" value=\"{$ca}\" />
        $cambutton
        </td></tr>");
                }
-
+           
                $wgOut->addHTML("
        <tr><td colspan='3'>&nbsp;</td></tr><tr>
        <td colspan='3' align='left'>