* Simple rate limiter for edits and page moves; set $wgRateLimits

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

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 87c004c..b33b953 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -6,12 +6,7 @@
  */
 
 /**
- *
- */
-require_once('UserMailer.php');
-
-/**
- * consutrctor
+ * constructor
  */
 function wfSpecialUserlogin() {
        global $wgCommandLineMode;
@@ -34,6 +29,10 @@ class LoginForm {
        var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
        var $mLoginattempt, $mRemember, $mEmail;
        
+       /**
+        * Constructor
+        * @param webrequest $request A webrequest object passed by reference
+        */
        function LoginForm( &$request ) {
                global $wgLang, $wgAllowRealName, $wgEnableEmail;
 
@@ -80,7 +79,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();
                        }
                }
@@ -105,19 +104,18 @@ class LoginForm {
                }
 
                $u->saveSettings();
-               $error = $this->mailPasswordInternal($u);
-
+               $result = $this->mailPasswordInternal($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;
        }
 
@@ -138,6 +136,9 @@ class LoginForm {
                $wgUser->setCookies();
 
                $wgUser->saveSettings();
+               if( $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) {
+                       $wgUser->sendConfirmationMail();
+               }
 
                if( $this->hasSessionCookie() ) {
                        return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
@@ -153,37 +154,43 @@ class LoginForm {
                global $wgUser, $wgOut;
                global $wgMaxNameChars;
                global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
+               global $wgMinimalPasswordLength;
 
                if (!$wgUser->isAllowedToCreateAccount()) {
                        $this->userNotPrivilegedMessage();
-                       return;
+                       return false;
                }
 
                if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
                        $this->mainLoginForm( wfMsg( 'badretype' ) );
-                       return;
+                       return false;
                }
                
                $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) ||
+                 $wgUser->isIP( $name ) ||
+                 (strpos( $name, '/' ) !== false) ||
                  (strlen( $name ) > $wgMaxNameChars) ||
                  ucFirst($name) != $u->getName() ) 
                {
                        $this->mainLoginForm( wfMsg( 'noname' ) );
-                       return;
+                       return false;
                }
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
-                       return;
+                       return false;
                }
                
                if ( 0 != $u->idForName() ) {
                        $this->mainLoginForm( wfMsg( 'userexists' ) );
-                       return;
+                       return false;
+               }
+
+               if ( strlen( $this->mPassword ) < $wgMinimalPasswordLength ) {
+                       $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+                       return false;
                }
 
                if ( $wgAccountCreationThrottle ) {
@@ -194,7 +201,7 @@ class LoginForm {
                        }
                        if ( $value > $wgAccountCreationThrottle ) {
                                $this->throttleHit( $wgAccountCreationThrottle );
-                               return;
+                               return false;
                        }
                }
 
@@ -214,6 +221,7 @@ class LoginForm {
                $u->setPassword( $this->mPassword );
                $u->setEmail( $this->mEmail );
                $u->setRealName( $this->mRealName );
+               $u->setToken();
                
                global $wgAuth;
                $wgAuth->initUser( $u );
@@ -247,10 +255,13 @@ class LoginForm {
                         * automatically create a new account for users that
                         * are externally defined but have not yet logged in.
                         */
-                       if( $wgAuth->autoCreate() &&
-                           $wgAuth->userExists( $u->getName() ) &&
-                           $wgAuth->authenticate( $u->getName(), $this->mPassword ) ) {
-                           $u =& $this->initUser( $u );
+                       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;
@@ -258,6 +269,7 @@ class LoginForm {
                } else {
                        $u->loadFromDatabase();
                }
+
                if (!$u->checkPassword( $this->mPassword )) {
                        $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
                        return;
@@ -307,55 +319,55 @@ class LoginForm {
 
                $u->loadFromDatabase();
 
-               $error = $this->mailPasswordInternal( $u );
-               if ($error === '') {
-                       $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
+               $result = $this->mailPasswordInternal( $u );
+               if( WikiError::isError( $result ) ) {
+                       $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
                } else {
-                       $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+                       $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
                }
-
        }
 
 
        /**
+        * @return mixed true on success, WikiError on failure
         * @access private
         */
        function mailPasswordInternal( $u ) {
-               global $wgDeferredUpdateList, $wgOutputEncoding;
                global $wgPasswordSender, $wgDBname, $wgIP;
                global $wgCookiePath, $wgCookieDomain;
 
                if ( '' == $u->getEmail() ) {
                        return wfMsg( 'noemail', $u->getName() );
                }
-               $np = User::randomPassword();
+
+               $np = $u->randomPassword();
                $u->setNewpassword( $np );
 
                setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+
                $u->saveSettings();
 
                $ip = $wgIP;
                if ( '' == $ip ) { $ip = '(Unknown)'; }
 
-               $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
-
-               $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindertitle' ), $m );
+               $m = wfMsg( 'passwordremindermailbody', $ip, $u->getName(), wfUrlencode($u->getName()), $np );
+               $result = $u->sendMail( wfMsg( 'passwordremindermailsubject' ), $m );
                
-               return htmlspecialchars( $error );
+               return $result;
        }
 
 
        /**
+        * @param string $msg Message that will be shown on success.
         * @access private
         */
        function successfulLogin( $msg ) {
                global $wgUser;
-               global $wgDeferredUpdateList;
                global $wgOut;
 
                # Run any hooks; ignore results
                
-               wfRunHooks('UserLoginComplete', $wgUser);
+               wfRunHooks('UserLoginComplete', array(&$wgUser));
                
                $wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
@@ -364,8 +376,9 @@ class LoginForm {
                $wgOut->returnToMain();
        }
 
+       /** */
        function userNotPrivilegedMessage() {
-               global $wgOut, $wgUser, $wgLang;
+               global $wgOut;
                
                $wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
@@ -384,20 +397,19 @@ class LoginForm {
                global $wgDBname, $wgAllowRealName, $wgEnableEmail;
 
                if ( '' == $this->mName ) {
-                       if ( 0 != $wgUser->getID() ) {
+                       if ( $wgUser->isLoggedIn() ) {
                                $this->mName = $wgUser->getName();
                        } else {
                                $this->mName = @$_COOKIE[$wgDBname.'UserName'];
                        }
                }
 
-               $q = 'action=submit';
+               $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();
                
@@ -410,10 +422,10 @@ class LoginForm {
                $template->set( 'action', $titleObj->getLocalUrl( $q ) );
                $template->set( 'error', $err );
                $template->set( 'create', $wgUser->isAllowedToCreateAccount() );
-               $template->set( 'createemail', $wgEnableEmail && $wgUser->getID() != 0 );
+               $template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() );
                $template->set( 'userealname', $wgAllowRealName );
                $template->set( 'useemail', $wgEnableEmail );
-               $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) );
+               $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember  );
                
                $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );