Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-fix 5377 following privacy issues. Now holds back on the hooks until the scope of the matter is determined. I want this double-checked before it's taken live, though.

Browse source
This commit is contained in:
Rob Church 2006-04-30 16:02:46 +00:00
parent f03334e6d9
commit ead187f882
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
includes/SpecialUserlogin.php
View file

@ -135,27 +135,40 @@ class LoginForm {
*/
function addNewAccount() {
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', array( $u ) );
if( $this->hasSessionCookie() ) {
return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ), false );
# 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;
}
}