*/
/**
- *
- */
-require_once('UserMailer.php');
-
-/**
- * consutrctor
+ * constructor
*/
function wfSpecialUserlogin() {
global $wgCommandLineMode;
var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
var $mLoginattempt, $mRemember, $mEmail;
+ /**
+ * Constructor
+ * @param webrequest $request A webrequest object passed by reference
+ */
function LoginForm( &$request ) {
global $wgLang, $wgAllowRealName, $wgEnableEmail;
+ global $wgEmailAuthentication;
$this->mName = $request->getText( 'wpName' );
$this->mPassword = $request->getText( 'wpPassword' );
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();
}
}
*/
function addNewAccountMailPassword() {
global $wgOut;
+ global $wgEmailAuthentication;
if ('' == $this->mEmail) {
$this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
return;
}
- $u->saveSettings();
- $error = $this->mailPasswordInternal($u);
+ $newadr = strtolower($this->mEmail);
+
+ # prepare for authentication and mail a temporary password to newadr
+ if ( !$u->isValidEmailAddr( $newadr ) ) {
+ return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+ }
+ $u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+ $u->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated
+
+ if ($wgEmailAuthentication) {
+ $error = $this->mailPasswordInternal( $u, true, $dummy ); # mail a temporary password to the dirty address
+ }
$wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
- if ( $error === '' ) {
- $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
- $wgOut->returnToMain( false );
+ if ($wgEmailAuthentication) {
+ if ($error === '') {
+ return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) );
} else {
- $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+ return $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
}
-
+ # if user returns, that new email address gets authenticated in checkpassword()
+ }
+# if ( $error === '' ) {
+# $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
+# $wgOut->returnToMain( false );
+# } else {
+# $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+# }
$u = 0;
}
*/
function addNewAccount() {
global $wgUser, $wgOut;
- global $wgDeferredUpdateList;
+ global $wgEmailAuthentication;
$u = $this->addNewAccountInternal();
return;
}
+ $newadr = strtolower($this->mEmail);
+ if ($newadr != '') { # prepare for authentication and mail a temporary password to newadr
+ if ( !$u->isValidEmailAddr( $newadr ) ) {
+ return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+ }
+ $u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+ $u->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated
+
+ if ($wgEmailAuthentication) {
+ # mail a temporary password to the dirty address
+
+ $error = $this->mailPasswordInternal( $u, true, $dummy );
+ if ($error === '') {
+ return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) );
+ } else {
+ return $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+ }
+ # if user returns, that new email address gets authenticated in checkpassword()
+ }
+ }
+
$wgUser = $u;
$wgUser->setCookies();
- $up = new UserUpdate();
- array_push( $wgDeferredUpdateList, $up );
+ $wgUser->saveSettings();
if( $this->hasSessionCookie() ) {
return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
}
}
-
/**
* @access private
*/
global $wgUser, $wgOut;
global $wgMaxNameChars;
global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
+ global $wgMinimalPasswordLength;
if (!$wgUser->isAllowedToCreateAccount()) {
$this->userNotPrivilegedMessage();
- return;
+ return false;
}
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) ||
+ $wgUser->isIP( $name ) ||
+ (strpos( $name, '/' ) !== false) ||
(strlen( $name ) > $wgMaxNameChars) ||
ucFirst($name) != $u->getName() )
{
$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 ( strlen( $this->mPassword ) < $wgMinimalPasswordLength ) {
+ $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+ return false;
}
if ( $wgAccountCreationThrottle ) {
}
if ( $value > $wgAccountCreationThrottle ) {
$this->throttleHit( $wgAccountCreationThrottle );
- return;
+ return false;
}
}
$u->setPassword( $this->mPassword );
$u->setEmail( $this->mEmail );
$u->setRealName( $this->mRealName );
+ $u->setToken();
global $wgAuth;
$wgAuth->initUser( $u );
* @access private
*/
function processLogin() {
- global $wgUser;
- global $wgDeferredUpdateList;
+ global $wgUser, $wgLang;
+ global $wgEmailAuthentication;
if ( '' == $this->mName ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
$this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
- $id = $u->idForName();
- if ( 0 == $id ) {
+ if ( 0 == $u->getID() ) {
global $wgAuth;
/**
* If the external authentication plugin allows it,
* 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->setId( $id );
$u->loadFromDatabase();
}
+
+ # store temporarily the status before the password check is performed
+ $mailmsg = '';
+ $oldadr = strtolower($u->getEmail());
+ $newadr = strtolower($this->mEmail);
+ $alreadyauthenticated = (( $u->mEmailAuthenticationtimestamp != 0 ) || ($oldadr == '')) ;
+
+ # checkPassword sets EmailAuthenticationtimestamp, if the newPassword is used
+
if (!$u->checkPassword( $this->mPassword )) {
$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
return;
}
$u->setOption( 'rememberpassword', $r );
+ /* check if user with correct password has entered a new email address */
+ if (($newadr <> '') && ($newadr <> $oldadr)) { # the user supplied a new email address on the login page
+
+ # prepare for authentication and mail a temporary password to newadr
+ if ( !$u->isValidEmailAddr( $newadr ) ) {
+ return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+ }
+ $u->mEmail = $newadr; # new behaviour: store this new emailaddr from login-page now into user database record ...
+ $u->mEmailAuthenticationtimestamp = 0; # ... but flag the address as "dirty" (unauthenticated)
+ $alreadyauthenticated = false;
+
+ if ($wgEmailAuthentication) {
+
+ # mail a temporary one-time password to the dirty address and return here to complete the user login
+ # if the user returns now or later using this temp. password, then the new email address $newadr
+ # - which is already stored in his user record - gets authenticated in checkpassword()
+
+ $error = $this->mailPasswordInternal( $u, false, $newpassword_temp);
+ $u->mNewpassword = $newpassword_temp;
+
+ # The temporary password is mailed. The user is logged-in as he entered his correct password
+ # This appears to be more intuitive than alternative 2.
+
+ if ($error === '') {
+ $mailmsg = '<br />' . wfMsg( 'passwordsentforemailauthentication', $u->getName() );
+ } else {
+ $mailmsg = '<br />' . wfMsg( 'mailerror', $error ) ;
+ }
+ }
+ }
+
$wgUser = $u;
$wgUser->setCookies();
- $up = new UserUpdate();
- array_push( $wgDeferredUpdateList, $up );
+ # save all settings (incl. new email address and/or temporary password, if applicable)
+ $wgUser->saveSettings();
+
+ if ( !$wgEmailAuthentication || $alreadyauthenticated ) {
+ $authenticated = '';
+ $mailmsg = '';
+ } elseif ($u->mEmailAuthenticationtimestamp != 0) {
+ $authenticated = ' ' . wfMsg( 'emailauthenticated', $wgLang->timeanddate( $u->mEmailAuthenticationtimestamp, true ) );
+ } else {
+ $authenticated = ' ' . wfMsg( 'emailnotauthenticated' );
+ }
if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
+ return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) . $authenticated . $mailmsg );
} else {
return $this->cookieRedirectCheck( 'login' );
}
$this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
- $id = $u->idForName();
- if ( 0 == $id ) {
+ if ( 0 == $u->getID() ) {
$this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
return;
}
- $u->setId( $id );
+
$u->loadFromDatabase();
- $error = $this->mailPasswordInternal( $u );
+ $error = $this->mailPasswordInternal( $u, true, $dummy );
if ($error === '') {
$this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
} else {
$this->mainLoginForm( wfMsg( 'mailerror', $error ) );
}
-
+ return;
}
/**
* @access private
*/
- function mailPasswordInternal( $u ) {
- global $wgDeferredUpdateList, $wgOutputEncoding;
+ function mailPasswordInternal( $u, $savesettings = true, &$newpassword_out ) {
global $wgPasswordSender, $wgDBname, $wgIP;
global $wgCookiePath, $wgCookieDomain;
if ( '' == $u->getEmail() ) {
return wfMsg( 'noemail', $u->getName() );
}
- $np = User::randomPassword();
+
+ $np = $u->randomPassword();
$u->setNewpassword( $np );
+ # we want to store this new password together with other values in the calling function
+ $newpassword_out = $u->mNewpassword;
+
+ # WHY IS THIS HERE ? SHOULDN'T IT BE User::setcookie ???
setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+
+ if ($savesettings) {
$u->saveSettings();
+ }
$ip = $wgIP;
if ( '' == $ip ) { $ip = '(Unknown)'; }
- $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
+ $m = wfMsg( 'passwordremindermailbody', $ip, $u->getName(), wfUrlencode($u->getName()), $np );
- $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindertitle' ), $m );
+ require_once('UserMailer.php');
+ $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindermailsubject' ), $m );
return htmlspecialchars( $error );
}
/**
+ * @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', array(&$wgUser));
+
$wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$wgOut->returnToMain();
}
+ /** */
function userNotPrivilegedMessage() {
- global $wgOut, $wgUser, $wgLang;
+ global $wgOut;
$wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
function mainLoginForm( $err ) {
global $wgUser, $wgOut, $wgLang;
global $wgDBname, $wgAllowRealName, $wgEnableEmail;
+ global $wgEmailAuthentication;
if ( '' == $this->mName ) {
- if ( 0 != $wgUser->getID() ) {
+ if ( $wgUser->isLoggedIn() ) {
$this->mName = $wgUser->getName();
} else {
$this->mName = @$_COOKIE[$wgDBname.'UserName'];
}
}
- $q = 'action=submit';
+ $q = 'action=submitlogin';
if ( !empty( $this->mReturnto ) ) {
$q .= '&returnto=' . wfUrlencode( $this->mReturnto );
}
$titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
-
require_once( 'templates/Userlogin.php' );
$template =& new UserloginTemplate();
$template->set( 'action', $titleObj->getLocalUrl( $q ) );
$template->set( 'error', $err );
$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( 'useemailauthent', $wgEmailAuthentication );
+ $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember );
$wgOut->setPageTitle( wfMsg( 'userlogin' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
dépôts / lhc / web / wiklou.git / blobdiff