| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php |
| — | — | @@ -104,7 +104,7 @@ |
| 105 | 105 | $form = Xml::openElement( 'form', array( 'method' => 'post', 'name' => 'accountrequest', |
| 106 | 106 | 'action' => $this->getTitle()->getLocalUrl(), 'enctype' => 'multipart/form-data' ) ); |
| 107 | 107 | $form .= '<fieldset><legend>' . wfMsgHtml( 'requestaccount-leg-user' ) . '</legend>'; |
| 108 | | - $form .= wfMsgExt( 'requestaccount-acc-text', array( 'parse' ) ) . "\n"; |
| | 108 | + $form .= wfMsgExt( 'requestaccount-acc-text', 'parse' ) . "\n"; |
| 109 | 109 | $form .= '<table cellpadding=\'4\'>'; |
| 110 | 110 | if ( $wgUseRealNamesOnly ) { |
| 111 | 111 | $form .= "<tr><td>" . wfMsgHtml( 'username' ) . "</td>"; |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | if ( count( $userAreas ) > 0 ) { |
| 134 | 134 | $form .= '<fieldset>'; |
| 135 | 135 | $form .= '<legend>' . wfMsgHtml( 'requestaccount-leg-areas' ) . '</legend>'; |
| 136 | | - $form .= wfMsgExt( 'requestaccount-areas-text', array( 'parse' ) ) . "\n"; |
| | 136 | + $form .= wfMsgExt( 'requestaccount-areas-text', 'parse' ) . "\n"; |
| 137 | 137 | |
| 138 | 138 | $form .= "<div style='height:150px; overflow:scroll; background-color:#f9f9f9;'>"; |
| 139 | 139 | $form .= "<table cellspacing='5' cellpadding='0' style='background-color:#f9f9f9;'><tr valign='top'>"; |
| — | — | @@ -178,7 +178,7 @@ |
| 179 | 179 | if ( $wgAccountRequestExtraInfo ) { |
| 180 | 180 | $form .= '<fieldset>'; |
| 181 | 181 | $form .= '<legend>' . wfMsgHtml( 'requestaccount-leg-other' ) . '</legend>'; |
| 182 | | - $form .= wfMsgExt( 'requestaccount-ext-text', array( 'parse' ) ) . "\n"; |
| | 182 | + $form .= wfMsgExt( 'requestaccount-ext-text', 'parse' ) . "\n"; |
| 183 | 183 | if ( $wgAllowAccountRequestFiles ) { |
| 184 | 184 | $form .= "<p>" . wfMsgHtml( 'requestaccount-attach' ) . " "; |
| 185 | 185 | $form .= Xml::input( 'wpUploadFile', 35, '', |
| — | — | @@ -259,22 +259,22 @@ |
| 260 | 260 | $submission = new AccountRequestSubmission( |
| 261 | 261 | $this->getUser(), |
| 262 | 262 | array( |
| 263 | | - 'userName' => $name, |
| 264 | | - 'realName' => $this->mRealName, |
| 265 | | - 'tosAccepted' => $this->mToS, |
| 266 | | - 'email' => $this->mEmail, |
| 267 | | - 'bio' => $this->mBio, |
| 268 | | - 'notes' => $this->mNotes, |
| 269 | | - 'urls' => $this->mUrls, |
| 270 | | - 'type' => $this->mType, |
| 271 | | - 'areas' => $this->mAreaSet, |
| 272 | | - 'registration' => wfTimestampNow(), |
| 273 | | - 'ip' => $this->getRequest()->getIP(), |
| 274 | | - 'attachmentPrevName' => $this->mPrevAttachment, |
| 275 | | - 'attachmentSrcName' => $this->mSrcName, |
| 276 | | - 'attachmentDidNotForget' => $this->mForgotAttachment, // confusing name :) |
| 277 | | - 'attachmentSize' => $this->mFileSize, |
| 278 | | - 'attachmentTempPath' => $this->mTempPath |
| | 263 | + 'userName' => $name, |
| | 264 | + 'realName' => $this->mRealName, |
| | 265 | + 'tosAccepted' => $this->mToS, |
| | 266 | + 'email' => $this->mEmail, |
| | 267 | + 'bio' => $this->mBio, |
| | 268 | + 'notes' => $this->mNotes, |
| | 269 | + 'urls' => $this->mUrls, |
| | 270 | + 'type' => $this->mType, |
| | 271 | + 'areas' => $this->mAreaSet, |
| | 272 | + 'registration' => wfTimestampNow(), |
| | 273 | + 'ip' => $this->getRequest()->getIP(), |
| | 274 | + 'attachmentPrevName' => $this->mPrevAttachment, |
| | 275 | + 'attachmentSrcName' => $this->mSrcName, |
| | 276 | + 'attachmentDidNotForget' => $this->mForgotAttachment, // confusing name :) |
| | 277 | + 'attachmentSize' => $this->mFileSize, |
| | 278 | + 'attachmentTempPath' => $this->mTempPath |
| 279 | 279 | ) |
| 280 | 280 | ); |
| 281 | 281 | |
| — | — | @@ -317,7 +317,7 @@ |
| 318 | 318 | * @return void |
| 319 | 319 | */ |
| 320 | 320 | protected function confirmEmailToken( $code ) { |
| 321 | | - global $wgConfirmAccountContact, $wgPasswordSender; |
| | 321 | + global $wgConfirmAccountContact, $wgPasswordSender, $wgPasswordSenderName; |
| 322 | 322 | $reqUser = $this->getUser(); |
| 323 | 323 | $out = $this->getOutput(); |
| 324 | 324 | # Confirm if this token is in the pending requests |
| — | — | @@ -328,7 +328,7 @@ |
| 329 | 329 | # Send mail to admin after e-mail has been confirmed |
| 330 | 330 | if ( $wgConfirmAccountContact != '' ) { |
| 331 | 331 | $target = new MailAddress( $wgConfirmAccountContact ); |
| 332 | | - $source = new MailAddress( $wgPasswordSender ); |
| | 332 | + $source = new MailAddress( $wgPasswordSender, $wgPasswordSenderName ); |
| 333 | 333 | $title = SpecialPage::getTitleFor( 'ConfirmAccounts' ); |
| 334 | 334 | $subject = wfMsgForContent( 'requestaccount-email-subj-admin' ); |
| 335 | 335 | $body = wfMsgForContent( |