if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] ) ) {
User::SetupSession();
}
-
+
$form = new LoginForm( $wgRequest );
$form->execute();
}
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
$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 = '';
*/
function addNewAccountMailPassword() {
global $wgOut;
-
+
if ('' == $this->mEmail) {
$this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
return;
$u->saveSettings();
$result = $this->mailPasswordInternal($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
*/
function addNewAccount() {
- global $wgUser, $wgOut, $wgEmailAuthentication;
+ global $wgUser, $wgEmailAuthentication;
$u = $this->addNewAccountInternal();
wfRunHooks( 'AddNewAccount' );
if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
+ return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ), false );
} else {
return $this->cookieRedirectCheck( 'new' );
}
}
$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;
$this->mainLoginForm( wfMsg( 'badretype' ) );
return false;
}
-
+
$name = trim( $this->mName );
$u = User::newFromName( $name );
if ( is_null( $u ) ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
return false;
}
-
+
if ( wfReadOnly() ) {
$wgOut->readOnlyPage();
return false;
}
-
+
if ( 0 != $u->idForName() ) {
$this->mainLoginForm( wfMsg( 'userexists' ) );
return false;
return false;
}
}
-
- if( !wfRunHooks( 'AbortNewAccount', array( $u ) ) ) {
+
+ $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;
}
return $this->initUser( $u );
}
-
+
/**
* Actually add a user to the database.
* Give it a User object that has been initialised with a name.
$u->setEmail( $this->mEmail );
$u->setRealName( $this->mRealName );
$u->setToken();
-
+
global $wgAuth;
$wgAuth->initUser( $u );
$u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
-
+
return $u;
}
$wgUser->setCookies();
$wgUser->saveSettings();
-
+
if( $this->hasSessionCookie() ) {
return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
} else {
* @access private
*/
function mailPassword() {
- global $wgUser, $wgDBname;
-
if ( '' == $this->mName ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
return;
* @access private
*/
function mailPasswordInternal( $u ) {
- global $wgDBname, $wgCookiePath, $wgCookieDomain, $wgCookieSecure;
+ global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
if ( '' == $u->getEmail() ) {
return wfMsg( 'noemail', $u->getName() );
$np = $u->randomPassword();
$u->setNewpassword( $np );
- setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain, $wgCookieSecure );
+ setcookie( "{$wgCookiePrefix}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain, $wgCookieSecure );
$u->saveSettings();
/**
- * @param string $msg Message that will be shown on success.
+ * @param string $msg Message that will be shown on success
+ * @param bool $auto Toggle auto-redirect to main page; default true
* @access 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();
+ $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
*/
function mainLoginForm( $msg, $msgtype = 'error' ) {
- global $wgUser, $wgOut, $wgLang;
- global $wgDBname, $wgAllowRealName, $wgEnableEmail;
+ global $wgUser, $wgOut;
+ global $wgAllowRealName, $wgEnableEmail;
+ global $wgCookiePrefix;
global $wgAuth;
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( 'SkinTemplate.php' );
require_once( 'templates/Userlogin.php' );
if ( $this->mType == 'signup' ) {
$link .= wfMsgHtml( $linkmsg . 'link' );
$link .= '</a>';
- $template->set( 'link', wfMsgHtml( $linkmsg, $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( '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 );
}
+
+ /**
+ * @access private
+ */
+ function showCreateOrLoginLink( &$user ) {
+ if( $this->mType == 'signup' ) {
+ return( true );
+ } elseif( $user->isAllowedToCreateAccount() ) {
+ return( true );
+ } else {
+ return( false );
+ }
+ }
/**
* @access private
global $wgDisableCookieCheck;
return ( $wgDisableCookieCheck ) ? true : ( isset( $_COOKIE[session_name()] ) );
}
-
+
/**
* @access private
*/
function cookieRedirectCheck( $type ) {
- global $wgOut, $wgLang;
+ global $wgOut;
$titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
$check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
dépôts / lhc / web / wiklou.git / blobdiff