| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -419,10 +419,10 @@ |
| 420 | 420 | if( !$row->acr_rejected ) {
|
| 421 | 421 | if( $this->reason ) {
|
| 422 | 422 | $result = $u->sendMail( wfMsg( 'confirmaccount-email-subj' ),
|
| 423 | | - wfMsg( 'confirmaccount-email-body4', $u->getName(), $this->reason ) );
|
| | 423 | + wfMsgExt( 'confirmaccount-email-body4', array('parseinline'), $u->getName(), $this->reason ) );
|
| 424 | 424 | } else {
|
| 425 | 425 | $result = $u->sendMail( wfMsg( 'confirmaccount-email-subj' ),
|
| 426 | | - wfMsg( 'confirmaccount-email-body3', $u->getName() ) );
|
| | 426 | + wfMsgExt( 'confirmaccount-email-body3', array('parseinline'), $u->getName() ) );
|
| 427 | 427 | }
|
| 428 | 428 | if( WikiError::isError( $result ) ) {
|
| 429 | 429 | $error = wfMsg( 'mailerror', htmlspecialchars( $result->getMessage() ) );
|
| — | — | @@ -461,28 +461,28 @@ |
| 462 | 462 | }
|
| 463 | 463 | $user = User::createNew( $name );
|
| 464 | 464 | # Make a random password
|
| 465 | | - $pass = User::randomPassword();
|
| | 465 | + $p = User::randomPassword();
|
| 466 | 466 | # VERY important to set email now. Otherwise user will have to request
|
| 467 | 467 | # a new password at the login screen...
|
| 468 | 468 | $user->setEmail( $row->acr_email );
|
| 469 | 469 | if( $this->reason ) {
|
| 470 | 470 | $result = $user->sendMail( wfMsg( 'confirmaccount-email-subj' ),
|
| 471 | | - wfMsg( 'confirmaccount-email-body2', $user->getName(), $pass, $this->reason ) );
|
| | 471 | + wfMsgExt( 'confirmaccount-email-body2', array('parseinline'), $user->getName(), $p, $this->reason ) );
|
| 472 | 472 | } else {
|
| 473 | 473 | $result = $user->sendMail( wfMsg( 'confirmaccount-email-subj' ),
|
| 474 | | - wfMsg( 'confirmaccount-email-body', $user->getName(), $pass ) );
|
| | 474 | + wfMsgExt( 'confirmaccount-email-body', array('parseinline'), $user->getName(), $p ) );
|
| 475 | 475 | }
|
| 476 | 476 | if( WikiError::isError( $result ) ) {
|
| 477 | 477 | $error = wfMsg( 'mailerror', htmlspecialchars( $result->getMessage() ) );
|
| 478 | 478 | $this->showForm( $error );
|
| 479 | 479 | return false;
|
| 480 | 480 | }
|
| 481 | | - if( !$wgAuth->addUser( $user, $pass, $row->acr_email, $row->acr_real_name ) ) {
|
| | 481 | + if( !$wgAuth->addUser( $user, $p, $row->acr_email, $row->acr_real_name ) ) {
|
| 482 | 482 | $this->showForm( wfMsgHtml( 'externaldberror' ) );
|
| 483 | 483 | return false;
|
| 484 | 484 | }
|
| 485 | 485 | # Set password and realname
|
| 486 | | - $user->setPassword( $pass );
|
| | 486 | + $user->setPassword( $p );
|
| 487 | 487 | $user->setRealName( $row->acr_real_name );
|
| 488 | 488 | $user->saveSettings(); // Save this into the DB
|
| 489 | 489 | # Check if the user already confirmed email address
|
| Index: trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php |
| — | — | @@ -99,8 +99,11 @@ |
| 100 | 100 |
|
| 101 | 101 | Password: $2
|
| 102 | 102 |
|
| 103 | | -You may have been granted a slightly different name than requested. This could be due to name collisions
|
| 104 | | -or policy reasons. Also, please immediatly login, go to your preferences options, and set a new password.',
|
| | 103 | +If you have been granted a slightly different name than requested, this could be due to name collisions
|
| | 104 | +or policy reasons.
|
| | 105 | +
|
| | 106 | +For security reasons you will need to change your password on first login. To login, please go to
|
| | 107 | +{{fullurl:Special:Userlogin}}.',
|
| 105 | 108 | 'confirmaccount-email-body2' => 'Your request for an account has been approved on {{SITENAME}}.
|
| 106 | 109 |
|
| 107 | 110 | Account name: $1
|
| — | — | @@ -109,8 +112,11 @@ |
| 110 | 113 |
|
| 111 | 114 | $3
|
| 112 | 115 |
|
| 113 | | -You may have been granted a slightly different name than requested. This could be due to name collisions
|
| 114 | | -or policy reasons. Also, please immediatly login, go to your preferences options, and set a new password.',
|
| | 116 | +If you have been granted a slightly different name than requested, this could be due to name collisions
|
| | 117 | +or policy reasons.
|
| | 118 | +
|
| | 119 | +For security reasons you will need to change your password on first login. To login, please go to
|
| | 120 | +{{fullurl:Special:Userlogin}}.',
|
| 115 | 121 | 'confirmaccount-email-body3' => 'Sorry, your request for an account "$1" has been rejected on {{SITENAME}}.
|
| 116 | 122 |
|
| 117 | 123 | There are several ways this can happen. You may not have filled out the form correctly, did not provide adequate
|