if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] ) ) {
User::SetupSession();
}
-
+
$form = new LoginForm( $wgRequest );
$form->execute();
}
* @package MediaWiki
* @subpackage SpecialPage
*/
+
+define("AuthSuccess", 0);
+define("AuthNoName", 1);
+define("AuthIllegal", 2);
+define("AuthWrongPluginPass", 3);
+define("AuthNotExists", 4);
+define("AuthWrongPass", 5);
+define("AuthEmptyPass", 6);
+
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;
-
+ var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
+
/**
* Constructor
* @param webrequest $request A webrequest object passed by reference
$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' );
-
+ $this->mLanguage = $request->getText( 'uselang' );
+
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();
- }
-
- wfRunHooks( 'AddNewAccount' );
-
- if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
+
+ # 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() ) )
+ $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 $wgEnableSorbs, $wgProxyWhitelist;
global $wgMemc, $wgAccountCreationThrottle, $wgDBname;
- global $wgAuth, $wgMinimalPasswordLength;
+ 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;
}
$ip = wfGetIP();
- if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) &&
- $wgUser->inSorbsBlacklist( $ip ) )
+ if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) &&
+ $wgUser->inSorbsBlacklist( $ip ) )
{
$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;
}
}
+ $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 );
$u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
-
+
return $u;
}
/**
- * @access private
+ * @private
*/
- function processLogin() {
- global $wgUser;
- global $wgAuth;
-
+
+ function authenticateUserData()
+ {
+ global $wgUser, $wgAuth, $wgReservedUsernames;
if ( '' == $this->mName ) {
- $this->mainLoginForm( wfMsg( 'noname' ) );
- return;
+ return AuthNoName;
}
$u = User::newFromName( $this->mName );
- if( is_null( $u ) ) {
- $this->mainLoginForm( wfMsg( 'noname' ) );
- return;
+ if( is_null( $u ) || in_array( $u->getName(), $wgReservedUsernames ) ) {
+ return AuthIllegal;
}
if ( 0 == $u->getID() ) {
global $wgAuth;
if ( $wgAuth->authenticate( $u->getName(), $this->mPassword ) ) {
$u =& $this->initUser( $u );
} else {
- $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
- return;
+ return AuthPluginPass;
}
} else {
- $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
- return;
+ return AuthNotExists;
}
} else {
$u->loadFromDatabase();
}
if (!$u->checkPassword( $this->mPassword )) {
- $this->mainLoginForm( wfMsg( $this->mPassword == '' ? 'wrongpasswordempty' : 'wrongpassword' ) );
- return;
+ return '' == $this->mPassword ? AuthEmptyPass : AuthWrongPass;
}
-
- # We've verified now, update the real record
- #
- if ( $this->mRemember ) {
- $r = 1;
- } else {
- $r = 0;
+ else
+ {
+ $wgAuth->updateUser( $u );
+ $wgUser = $u;
+ return AuthSuccess;
}
- $u->setOption( 'rememberpassword', $r );
-
- $wgAuth->updateUser( $u );
+ }
+
+ function processLogin() {
+ global $wgUser, $wgAuth, $wgReservedUsernames;
- $wgUser = $u;
- $wgUser->setCookies();
+ switch ($this->authenticateUserData())
+ {
+ case (AuthSuccess):
+ # We've verified now, update the real record
+ #
+ $wgUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
+ $wgUser->setCookies();
+ $wgUser->saveSettings();
+
+ if( $this->hasSessionCookie() ) {
+ return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
+ } else {
+ return $this->cookieRedirectCheck( 'login' );
+ }
+ break;
- $wgUser->saveSettings();
-
- if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
- } else {
- return $this->cookieRedirectCheck( 'login' );
+ case (AuthNoName):
+ case (AuthIllegal):
+ $this->mainLoginForm( wfMsg( 'noname' ) );
+ break;
+ case (AuthWrongPluginPass):
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ break;
+ case (AuthNotExists):
+ $this->mainLoginForm( wfMsg( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
+ break;
+ case (AuthWrongPass):
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ break;
+ case (AuthEmptyPass):
+ $this->mainLoginForm( wfMsg( 'wrongpasswordempty' ) );
+ break;
+ default:
+ wfDebugDieBacktrace( "Unhandled case value" );
}
}
/**
- * @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;
- global $wgCookiePath, $wgCookieDomain;
+ global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
+ global $wgServer, $wgScript;
if ( '' == $u->getEmail() ) {
- return wfMsg( 'noemail', $u->getName() );
+ return new WikiError( 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 = 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 );
+ }
+
+ /** */
+ 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, $wgEnableEmail;
- global $wgAuth;
+ function mainLoginForm( $msg, $msgtype = 'error' ) {
+ global $wgUser, $wgOut, $wgAllowRealName, $wgEnableEmail;
+ global $wgCookiePrefix, $wgAuth, $wgLoginLanguageSelector;
+
+ if ( $this->mType == 'signup' ) {
+ if ( !$wgUser->isAllowed( 'createaccount' ) ) {
+ $this->userNotPrivilegedMessage();
+ return;
+ } elseif ( $wgUser->isBlockedFromCreateAccount() ) {
+ $this->userBlockedMessage();
+ return;
+ }
+ }
if ( '' == $this->mName ) {
if ( $wgUser->isLoggedIn() ) {
$this->mName = $wgUser->getName();
} else {
- $this->mName = @$_COOKIE[$wgDBname.'UserName'];
+ $this->mName = @$_COOKIE[$wgCookiePrefix.'UserName'];
}
}
$titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
- require_once( 'templates/Userlogin.php' );
-
if ( $this->mType == 'signup' ) {
- $template =& new UsercreateTemplate();
+ $template = new UsercreateTemplate();
$q = 'action=submitlogin&type=signup';
$linkq = 'type=login';
- $msg = 'gotaccount';
+ $linkmsg = 'gotaccount';
} else {
- $template =& new UserloginTemplate();
+ $template = new UserloginTemplate();
$q = 'action=submitlogin&type=login';
$linkq = 'type=signup';
- $msg = 'nologin';
+ $linkmsg = 'nologin';
}
- if ( !empty( $this->mReturnto ) ) {
- $returnto = '&returnto=' . wfUrlencode( $this->mReturnto );
+ if ( !empty( $this->mReturnTo ) ) {
+ $returnto = '&returnto=' . wfUrlencode( $this->mReturnTo );
$q .= $returnto;
$linkq .= $returnto;
}
+
+ # 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( $msg . 'link' );
+ $link .= wfMsgHtml( $linkmsg . 'link' );
$link .= '</a>';
- $template->set( 'link', wfMsgHtml( $msg, $link ) );
+ # 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 );
+
+ # Prepare language selection links as needed
+ if( $wgLoginLanguageSelector ) {
+ $template->set( 'languages', $this->makeLanguageSelector() );
+ if( $this->mLanguage )
+ $template->set( 'uselang', $this->mLanguage );
+ }
+ // 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->isAllowed( 'createaccount' ) ) {
+ return( true );
+ } else {
+ return( false );
+ }
+ }
/**
- * @access private
+ * @private
*/
function hasSessionCookie() {
global $wgDisableCookieCheck;
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;
$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 != '' && $msg != '<loginlanguagelinks>' ) {
+ $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 = Title::makeTitle( NS_SPECIAL, '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 ) );
+ }
+
}
?>
dépôts / lhc / web / wiklou.git / blobdiff