function wfSpecialUserlogin() {
global $wgCommandLineMode;
global $wgRequest;
- if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] ) ) {
+ if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] ) ) {
User::SetupSession();
}
-
+
$form = new LoginForm( $wgRequest );
$form->execute();
}
* @subpackage SpecialPage
*/
class LoginForm {
- var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
+ var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
var $mLoginattempt, $mRemember, $mEmail, $mDomain;
-
+
/**
* Constructor
* @param webrequest $request A webrequest object passed by reference
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->mDomain = $request->getText( 'wpDomain' );
- $this->mReturnto = $request->getVal( 'returnto' );
+ $this->mReturnTo = $request->getVal( 'returnto' );
$this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
$this->mPosted = $request->wasPosted();
$this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
$this->mLoginattempt = $request->getCheck( 'wpLoginattempt' );
$this->mAction = $request->getVal( 'action' );
$this->mRemember = $request->getCheck( 'wpRemember' );
-
+
if( $wgEnableEmail ) {
$this->mEmail = $request->getText( 'wpEmail' );
} else {
} 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 = '';
}
}
}
/**
- * @access private
+ * @private
*/
function addNewAccountMailPassword() {
global $wgOut;
-
+
if ('' == $this->mEmail) {
$this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
return;
$u->saveSettings();
$result = $this->mailPasswordInternal($u);
-
+
+ wfRunHooks( 'AddNewAccount', array( $u ) );
+
$wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
-
+
if( WikiError::isError( $result ) ) {
$this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
} else {
/**
- * @access private
+ * @private
*/
function addNewAccount() {
- global $wgUser, $wgOut, $wgEmailAuthentication;
-
+ 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;
- }
-
- $wgUser = $u;
- $wgUser->setCookies();
-
- $wgUser->saveSettings();
- if( $wgEmailAuthentication && $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) {
- $wgUser->sendConfirmationMail();
- }
-
- if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
+
+ # Save user settings and send out an email authentication message if needed
+ $u->saveSettings();
+ if( $wgEmailAuthentication && User::isValidEmailAddr( $u->getEmail() ) )
+ $u->sendConfirmationMail();
+
+ # 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;
+ $skin = $wgUser->getSkin();
+ $self = Title::makeTitle( NS_SPECIAL, '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 $wgUseLatin1, $wgEnableSorbs, $wgProxyWhitelist;
- global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
- global $wgAuth;
+ global $wgEnableSorbs, $wgProxyWhitelist;
+ global $wgMemc, $wgAccountCreationThrottle, $wgDBname;
+ global $wgAuth, $wgMinimalPasswordLength, $wgReservedUsernames;
// If the user passes an invalid domain, something is fishy
if( !$wgAuth->validDomain( $this->mDomain ) ) {
}
}
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ return false;
+ }
+
if (!$wgUser->isAllowedToCreateAccount()) {
$this->userNotPrivilegedMessage();
return false;
}
- if ( $wgEnableSorbs && !in_array( $wgIP, $wgProxyWhitelist ) &&
- $wgUser->inSorbsBlacklist( $wgIP ) )
+ $ip = wfGetIP();
+ if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) &&
+ $wgUser->inSorbsBlacklist( $ip ) )
{
- $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) );
+ $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
return;
}
-
- 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 ) ) {
+ if ( is_null( $u ) || in_array( $u->getName(), $wgReservedUsernames ) ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
return false;
}
-
- if ( wfReadOnly() ) {
- $wgOut->readOnlyPage();
- return false;
- }
-
+
if ( 0 != $u->idForName() ) {
$this->mainLoginForm( wfMsg( 'userexists' ) );
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;
}
if ( $wgAccountCreationThrottle ) {
- $key = $wgDBname.':acctcreate:ip:'.$wgIP;
+ $key = $wgDBname.':acctcreate:ip:'.$ip;
$value = $wgMemc->incr( $key );
if ( !$value ) {
$wgMemc->set( $key, 1, 86400 );
}
}
+ $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( !$wgAuth->addUser( $u, $this->mPassword ) ) {
$this->mainLoginForm( wfMsg( 'externaldberror' ) );
return false;
return $this->initUser( $u );
}
-
+
/**
* 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
+ * @param $u User object.
+ * @return User object.
+ * @private
*/
function &initUser( &$u ) {
$u->addToDatabase();
$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 );
-
+ $u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
+
return $u;
}
/**
- * @access private
+ * @private
*/
function processLogin() {
- global $wgUser;
- global $wgAuth;
+ global $wgUser, $wgAuth, $wgReservedUsernames;
if ( '' == $this->mName ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
$u = User::newFromName( $this->mName );
- if( is_null( $u ) ) {
+ if( is_null( $u ) || in_array( $u->getName(), $wgReservedUsernames ) ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
}
if (!$u->checkPassword( $this->mPassword )) {
- $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ $this->mainLoginForm( wfMsg( $this->mPassword == '' ? 'wrongpasswordempty' : 'wrongpassword' ) );
return;
}
$wgUser->setCookies();
$wgUser->saveSettings();
-
+
if( $this->hasSessionCookie() ) {
return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
} else {
}
/**
- * @access private
+ * @private
*/
function mailPassword() {
- global $wgUser, $wgDeferredUpdateList, $wgOutputEncoding;
- global $wgCookiePath, $wgCookieDomain, $wgDBname;
-
+ global $wgUser, $wgOut;
+
+ # Check against the rate limiter
+ if( $wgUser->pingLimiter( 'mailpassword' ) ) {
+ $wgOut->rateLimited();
+ return;
+ }
+
if ( '' == $this->mName ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
return;
if( WikiError::isError( $result ) ) {
$this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
} else {
- $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
+ $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ), 'success' );
}
}
/**
* @return mixed true on success, WikiError on failure
- * @access private
+ * @private
*/
function mailPasswordInternal( $u ) {
- global $wgPasswordSender, $wgDBname, $wgIP;
- global $wgCookiePath, $wgCookieDomain;
+ global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
+ global $wgServer, $wgScript;
if ( '' == $u->getEmail() ) {
return wfMsg( 'noemail', $u->getName() );
$np = $u->randomPassword();
$u->setNewpassword( $np );
- setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+ 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 );
$result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m );
return $result;
/**
- * @param string $msg Message that will be shown on success.
- * @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 $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;
-
+
$wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$wgOut->addWikiText( wfMsg( 'whitelistacctext' ) );
-
+
$wgOut->returnToMain( false );
}
/**
- * @access private
+ * @private
*/
- function mainLoginForm( $err ) {
- global $wgUser, $wgOut, $wgLang;
- global $wgDBname, $wgAllowRealName, $wgEnableEmail;
+ function mainLoginForm( $msg, $msgtype = 'error' ) {
+ global $wgUser, $wgOut;
+ global $wgAllowRealName, $wgEnableEmail;
+ global $wgCookiePrefix;
global $wgAuth;
+ if ( $this->mType == 'signup' && !$wgUser->isAllowedToCreateAccount() ) {
+ $this->userNotPrivilegedMessage();
+ return;
+ }
+
if ( '' == $this->mName ) {
if ( $wgUser->isLoggedIn() ) {
$this->mName = $wgUser->getName();
} else {
- $this->mName = @$_COOKIE[$wgDBname.'UserName'];
+ $this->mName = @$_COOKIE[$wgCookiePrefix.'UserName'];
}
}
- $q = 'action=submitlogin';
- if ( !empty( $this->mReturnto ) ) {
- $q .= '&returnto=' . wfUrlencode( $this->mReturnto );
- }
$titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+ require_once( 'SkinTemplate.php' );
require_once( 'templates/Userlogin.php' );
- $template =& new UserloginTemplate();
+
+ if ( $this->mType == 'signup' ) {
+ $template =& new UsercreateTemplate();
+ $q = 'action=submitlogin&type=signup';
+ $linkq = 'type=login';
+ $linkmsg = 'gotaccount';
+ } else {
+ $template =& new UserloginTemplate();
+ $q = 'action=submitlogin&type=login';
+ $linkq = 'type=signup';
+ $linkmsg = 'nologin';
+ }
+
+ if ( !empty( $this->mReturnTo ) ) {
+ $returnto = '&returnto=' . wfUrlencode( $this->mReturnTo );
+ $q .= $returnto;
+ $linkq .= $returnto;
+ }
+
+ $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( 'domain', $this->mDomain );
$template->set( 'action', $titleObj->getLocalUrl( $q ) );
- $template->set( 'error', $err );
- $template->set( 'create', $wgUser->isAllowedToCreateAccount() );
+ $template->set( 'message', $msg );
+ $template->set( 'messagetype', $msgtype );
$template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() );
$template->set( 'userealname', $wgAllowRealName );
$template->set( 'useemail', $wgEnableEmail );
$template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember );
- $wgAuth->modifyUITemplate( $template );
+ // Give authentication and captcha plugins a chance to modify the form
+ $wgAuth->modifyUITemplate( $template );
+ if ( $this->mType == 'signup' ) {
+ wfRunHooks( 'UserCreateForm', array( &$template ) );
+ } else {
+ wfRunHooks( 'UserLoginForm', array( &$template ) );
+ }
+
$wgOut->setPageTitle( wfMsg( 'userlogin' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$wgOut->addTemplate( $template );
}
+
+ /**
+ * @private
+ */
+ function showCreateOrLoginLink( &$user ) {
+ if( $this->mType == 'signup' ) {
+ return( true );
+ } elseif( $user->isAllowedToCreateAccount() ) {
+ 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' );
$check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
}
/**
- * @access private
+ * @private
*/
function onCookieRedirectCheck( $type ) {
global $wgUser;
}
/**
- * @access private
+ * @private
*/
function throttleHit( $limit ) {
global $wgOut;
dépôts / lhc / web / wiklou.git / blobdiff