$oldpassMsg = $user->isLoggedIn() ? 'oldpassword' : 'resetpass-temp-password';
}
- $fields = array(
- 'Name' => array(
+ $fields = [
+ 'Name' => [
'type' => 'info',
'label-message' => 'username',
'default' => $request->getVal( 'wpName', $user->getName() ),
- ),
- 'Password' => array(
+ ],
+ 'Password' => [
'type' => 'password',
'label-message' => $oldpassMsg,
- ),
- 'NewPassword' => array(
+ ],
+ 'NewPassword' => [
'type' => 'password',
'label-message' => 'newpassword',
- ),
- 'Retype' => array(
+ ],
+ 'Retype' => [
'type' => 'password',
'label-message' => 'retypenew',
- ),
- );
+ ],
+ ];
if ( !$this->getUser()->isLoggedIn() ) {
- if ( !LoginForm::getLoginToken() ) {
- LoginForm::setLoginToken();
- }
- $fields['LoginOnChangeToken'] = array(
+ $fields['LoginOnChangeToken'] = [
'type' => 'hidden',
'label' => 'Change Password Token',
- 'default' => LoginForm::getLoginToken(),
- );
+ 'default' => LoginForm::getLoginToken()->toString(),
+ ];
}
- $extraFields = array();
- Hooks::run( 'ChangePasswordForm', array( &$extraFields ) );
+ $extraFields = [];
+ Hooks::run( 'ChangePasswordForm', [ &$extraFields ] );
foreach ( $extraFields as $extra ) {
list( $name, $label, $type, $default ) = $extra;
- $fields[$name] = array(
+ $fields[$name] = [
'type' => $type,
'name' => $name,
'label-message' => $label,
'default' => $default,
- );
+ ];
}
if ( !$user->isLoggedIn() ) {
- $fields['Remember'] = array(
+ $fields['Remember'] = [
'type' => 'check',
'label' => $this->msg( 'remembermypassword' )
->numParams(
ceil( $this->getConfig()->get( 'CookieExpiration' ) / ( 3600 * 24 ) )
)->text(),
'default' => $request->getVal( 'wpRemember' ),
- );
+ ];
}
return $fields;
? 'resetpass-submit-loggedin'
: 'resetpass_submit'
);
- $form->addButton( array(
+ $form->addButton( [
'name' => 'wpCancel',
'value' => $this->msg( 'resetpass-submit-cancel' )->text()
- ) );
+ ] );
$form->setHeaderText( $this->msg( 'resetpass_text' )->parseAsBlock() );
if ( $this->mPreTextMessage instanceof Message ) {
$form->addPreText( $this->mPreTextMessage->parseAsBlock() );
}
if ( !$this->getUser()->isLoggedIn()
- && $request->getVal( 'wpLoginOnChangeToken' ) !== LoginForm::getLoginToken()
+ && !LoginForm::getLoginToken()->match( $request->getVal( 'wpLoginOnChangeToken' ) )
) {
// Potential CSRF (bug 62497)
return false;
$this->getOutput()->returnToMain();
} else {
$request = $this->getRequest();
- LoginForm::setLoginToken();
- $token = LoginForm::getLoginToken();
- $data = array(
+ LoginForm::clearLoginToken();
+ $token = LoginForm::getLoginToken()->toString();
+ $data = [
'action' => 'submitlogin',
'wpName' => $this->mUserName,
'wpDomain' => $this->mDomain,
'wpLoginToken' => $token,
'wpPassword' => $request->getVal( 'wpNewPassword' ),
- ) + $request->getValues( 'wpRemember', 'returnto', 'returntoquery' );
+ ] + $request->getValues( 'wpRemember', 'returnto', 'returntoquery' );
$login = new LoginForm( new DerivativeRequest( $request, $data, true ) );
$login->setContext( $this->getContext() );
$login->execute( null );
}
if ( $newpass !== $retype ) {
- Hooks::run( 'PrefsPasswordAudit', array( $user, $newpass, 'badretype' ) );
+ Hooks::run( 'PrefsPasswordAudit', [ $user, $newpass, 'badretype' ] );
return Status::newFatal( $this->msg( 'badretype' ) );
}
- $throttleCount = LoginForm::incLoginThrottle( $this->mUserName );
- if ( $throttleCount === true ) {
- $lang = $this->getLanguage();
- $throttleInfo = $this->getConfig()->get( 'PasswordAttemptThrottle' );
+ $throttleInfo = LoginForm::incrementLoginThrottle( $this->mUserName );
+ if ( $throttleInfo ) {
return Status::newFatal( $this->msg( 'changepassword-throttled' )
- ->params( $lang->formatDuration( $throttleInfo['seconds'] ) )
+ ->durationParams( $throttleInfo['wait'] )
);
}
// @todo Make these separate messages, since the message is written for both cases
if ( !$user->checkTemporaryPassword( $oldpass ) && !$user->checkPassword( $oldpass ) ) {
- Hooks::run( 'PrefsPasswordAudit', array( $user, $newpass, 'wrongpassword' ) );
+ Hooks::run( 'PrefsPasswordAudit', [ $user, $newpass, 'wrongpassword' ] );
return Status::newFatal( $this->msg( 'resetpass-wrong-oldpass' ) );
}
// Do AbortChangePassword after checking mOldpass, so we don't leak information
// by possibly aborting a new password before verifying the old password.
$abortMsg = 'resetpass-abort-generic';
- if ( !Hooks::run( 'AbortChangePassword', array( $user, $oldpass, $newpass, &$abortMsg ) ) ) {
- Hooks::run( 'PrefsPasswordAudit', array( $user, $newpass, 'abortreset' ) );
+ if ( !Hooks::run( 'AbortChangePassword', [ $user, $oldpass, $newpass, &$abortMsg ] ) ) {
+ Hooks::run( 'PrefsPasswordAudit', [ $user, $newpass, 'abortreset' ] );
return Status::newFatal( $this->msg( $abortMsg ) );
}
// Please reset throttle for successful logins, thanks!
- if ( $throttleCount ) {
- LoginForm::clearLoginThrottle( $this->mUserName );
- }
+ LoginForm::clearLoginThrottle( $this->mUserName );
try {
$user->setPassword( $newpass );
- Hooks::run( 'PrefsPasswordAudit', array( $user, $newpass, 'success' ) );
+ Hooks::run( 'PrefsPasswordAudit', [ $user, $newpass, 'success' ] );
} catch ( PasswordError $e ) {
- Hooks::run( 'PrefsPasswordAudit', array( $user, $newpass, 'error' ) );
+ Hooks::run( 'PrefsPasswordAudit', [ $user, $newpass, 'error' ] );
return Status::newFatal( new RawMessage( $e->getMessage() ) );
}
);
}
// Give extensions a chance to force an expiration
- Hooks::run( 'ResetPasswordExpiration', array( $this, &$newExpire ) );
+ Hooks::run( 'ResetPasswordExpiration', [ $this, &$newExpire ] );
$dbw = wfGetDB( DB_MASTER );
$dbw->update(
'user',
- array( 'user_password_expires' => $dbw->timestampOrNull( $newExpire ) ),
- array( 'user_id' => $user->getID() ),
+ [ 'user_password_expires' => $dbw->timestampOrNull( $newExpire ) ],
+ [ 'user_id' => $user->getID() ],
__METHOD__
);
}