*/
/**
- *
- */
-require_once('UserMailer.php');
-
-/**
- * consutrctor
+ * constructor
*/
function wfSpecialUserlogin() {
global $wgCommandLineMode;
global $wgRequest;
- if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] ) ) {
+ if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] ) ) {
User::SetupSession();
}
class LoginForm {
var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
- var $mLoginattempt, $mRemember, $mEmail;
+ var $mLoginattempt, $mRemember, $mEmail, $mDomain;
+ /**
+ * Constructor
+ * @param webrequest $request A webrequest object passed by reference
+ */
function LoginForm( &$request ) {
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->mCookieCheck = $request->getVal( 'wpCookieCheck' );
$this->mPosted = $request->wasPosted();
} 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 = '';
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();
}
}
}
$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;
}
* @access private
*/
function addNewAccount() {
- global $wgUser, $wgOut;
+ global $wgUser, $wgOut, $wgEmailAuthentication;
$u = $this->addNewAccountInternal();
$wgUser->setCookies();
$wgUser->saveSettings();
+ if( $wgEmailAuthentication && $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) {
+ $wgUser->sendConfirmationMail();
+ }
+
+ wfRunHooks( 'AddNewAccount' );
if( $this->hasSessionCookie() ) {
return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
*/
function addNewAccountInternal() {
global $wgUser, $wgOut;
- global $wgMaxNameChars;
- global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
+ global $wgUseLatin1, $wgEnableSorbs, $wgProxyWhitelist;
+ global $wgMemc, $wgAccountCreationThrottle, $wgDBname;
+ global $wgAuth, $wgMinimalPasswordLength;
+
+ // If the user passes an invalid domain, something is fishy
+ if( !$wgAuth->validDomain( $this->mDomain ) ) {
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ return false;
+ }
+
+ // If we are not allowing users to login locally, we should
+ // be checking to see if the user is actually able to
+ // authenticate to the authentication server before they
+ // create an account (otherwise, they can create a local account
+ // and login as any domain user). We only need to check this for
+ // domains that aren't local.
+ if( 'local' != $this->mDomain && '' != $this->mDomain ) {
+ if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mName ) || !$wgAuth->authenticate( $this->mName, $this->mPassword ) ) ) {
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ return false;
+ }
+ }
if (!$wgUser->isAllowedToCreateAccount()) {
$this->userNotPrivilegedMessage();
+ return false;
+ }
+
+ $ip = wfGetIP();
+ 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;
+ 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) ||
- (strlen( $name ) > $wgMaxNameChars) ||
- ucFirst($name) != $u->getName() )
- {
+ if ( is_null( $u ) ) {
$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 ( !$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 );
}
if ( $value > $wgAccountCreationThrottle ) {
$this->throttleHit( $wgAccountCreationThrottle );
- return;
+ return false;
}
}
+ if( !$wgAuth->addUser( $u, $this->mPassword ) ) {
+ $this->mainLoginForm( wfMsg( 'externaldberror' ) );
+ return false;
+ }
+
+ # Update user count
+ $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
+ $ssUpdate->doUpdate();
+
return $this->initUser( $u );
}
$u->setPassword( $this->mPassword );
$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;
}
*/
function processLogin() {
global $wgUser;
+ global $wgAuth;
if ( '' == $this->mName ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
* 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;
} else {
$u->loadFromDatabase();
}
+
if (!$u->checkPassword( $this->mPassword )) {
- $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ $this->mainLoginForm( wfMsg( $this->mPassword == '' ? 'wrongpasswordempty' : 'wrongpassword' ) );
return;
}
}
$u->setOption( 'rememberpassword', $r );
+ $wgAuth->updateUser( $u );
+
$wgUser = $u;
$wgUser->setCookies();
$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() ), 'success' );
}
-
}
/**
+ * @return mixed true on success, WikiError on failure
* @access private
*/
function mailPasswordInternal( $u ) {
- global $wgDeferredUpdateList, $wgOutputEncoding;
- global $wgPasswordSender, $wgDBname, $wgIP;
+ global $wgPasswordSender, $wgDBname;
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;
+ $ip = wfGetIP();
if ( '' == $ip ) { $ip = '(Unknown)'; }
$m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
- $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindertitle' ), $m );
-
- return htmlspecialchars( $error );
+ $result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m );
+ 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' );
$wgOut->returnToMain();
}
+ /** */
function userNotPrivilegedMessage() {
- global $wgOut, $wgUser, $wgLang;
+ global $wgOut;
$wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
/**
* @access private
*/
- function mainLoginForm( $err ) {
+ function mainLoginForm( $msg, $msgtype = 'error' ) {
global $wgUser, $wgOut, $wgLang;
global $wgDBname, $wgAllowRealName, $wgEnableEmail;
+ global $wgAuth;
if ( '' == $this->mName ) {
- if ( 0 != $wgUser->getID() ) {
+ if ( $wgUser->isLoggedIn() ) {
$this->mName = $wgUser->getName();
} else {
$this->mName = @$_COOKIE[$wgDBname.'UserName'];
}
}
- $q = 'action=submit';
+ $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+
+ require_once( 'templates/Userlogin.php' );
+
+ 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 ) ) {
- $q .= '&returnto=' . wfUrlencode( $this->mReturnto );
+ $returnto = '&returnto=' . wfUrlencode( $this->mReturnto );
+ $q .= $returnto;
+ $linkq .= $returnto;
}
- $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+ $link = '<a href="' . htmlspecialchars ( $titleObj->getLocalUrl( $linkq ) ) . '">';
+ $link .= wfMsgHtml( $linkmsg . 'link' );
+ $link .= '</a>';
- require_once( 'templates/Userlogin.php' );
- $template =& new UserloginTemplate();
+ $template->set( 'link', wfMsgHtml( $linkmsg, $link ) );
$template->set( 'name', $this->mName );
$template->set( 'password', $this->mPassword );
$template->set( 'retype', $this->mRetype );
$template->set( 'email', $this->mEmail );
$template->set( 'realname', $this->mRealName );
+ $template->set( 'domain', $this->mDomain );
$template->set( 'action', $titleObj->getLocalUrl( $q ) );
- $template->set( 'error', $err );
+ $template->set( 'message', $msg );
+ $template->set( 'messagetype', $msgtype );
$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 );
+ $wgAuth->modifyUITemplate( $template );
$wgOut->setPageTitle( wfMsg( 'userlogin' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
*/
function hasSessionCookie() {
global $wgDisableCookieCheck;
- return ( $wgDisableCookieCheck ) ? true : ( '' != $_COOKIE[session_name()] );
+ return ( $wgDisableCookieCheck ) ? true : ( isset( $_COOKIE[session_name()] ) );
}
/**
dépôts / lhc / web / wiklou.git / blobdiff