global $wgUser, $wgOut, $wgRequest, $wgEnableEmail, $wgEnableUserEmail;
if( !( $wgEnableEmail && $wgEnableUserEmail ) ) {
- $wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
+ $wgOut->showErrorPage( "nosuchspecialpage", "nospecialpagetext" );
return;
}
-
- if ( $wgUser->isAnon() ||
- ( !$wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) ) {
- $wgOut->errorpage( "mailnologin", "mailnologintext" );
+
+ if( !$wgUser->canSendEmail() ) {
+ wfDebug( "User can't send.\n" );
+ $wgOut->showErrorPage( "mailnologin", "mailnologintext" );
return;
}
-
+
$action = $wgRequest->getVal( 'action' );
- if( empty( $par ) ) {
- $target = $wgRequest->getVal( 'target' );
- } else {
- $target = $par;
- }
+ $target = isset($par) ? $par : $wgRequest->getVal( 'target' );
if ( "" == $target ) {
- $wgOut->errorpage( "notargettitle", "notargettext" );
+ wfDebug( "Target is empty.\n" );
+ $wgOut->showErrorPage( "notargettitle", "notargettext" );
return;
}
+
$nt = Title::newFromURL( $target );
if ( is_null( $nt ) ) {
- $wgOut->errorpage( "notargettitle", "notargettext" );
- return;
- }
- $nu = User::newFromName( $nt->getText() );
-
- if ( 0 == $nu->getID() ) {
- $wgOut->errorpage( "noemailtitle", "noemailtext" );
+ wfDebug( "Target is invalid title.\n" );
+ $wgOut->showErrorPage( "notargettitle", "notargettext" );
return;
}
- $address = $nu->getEmail();
-
- if ( ( !$nu->isValidEmailAddr( $address ) ) ||
- ( 1 == $nu->getOption( "disablemail" ) ) ||
- ( 0 == $nu->getEmailauthenticationtimestamp() ) ) {
- $wgOut->errorpage( "noemailtitle", "noemailtext" );
+ $nu = User::newFromName( $nt->getText() );
+ if( is_null( $nu ) || !$nu->canReceiveEmail() ) {
+ wfDebug( "Target is invalid user or can't receive.\n" );
+ $wgOut->showErrorPage( "noemailtitle", "noemailtext" );
return;
}
- $f = new EmailUserForm( $nu->getName() . " <{$address}>", $target );
+ $f = new EmailUserForm( $nu );
if ( "success" == $action ) {
- $f->showSuccess();
+ $f->showSuccess( $nu );
} else if ( "submit" == $action && $wgRequest->wasPosted() &&
$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
$f->doSubmit();
*/
class EmailUserForm {
- var $mAddress;
var $target;
var $text, $subject;
- function EmailUserForm( $addr, $target ) {
+ /**
+ * @param User $target
+ */
+ function EmailUserForm( $target ) {
global $wgRequest;
- $this->mAddress = $addr;
$this->target = $target;
$this->text = $wgRequest->getText( 'wpText' );
$this->subject = $wgRequest->getText( 'wpSubject' );
}
function showForm() {
- global $wgOut, $wgUser, $wgLang;
+ global $wgOut, $wgUser;
$wgOut->setPagetitle( wfMsg( "emailpage" ) );
$wgOut->addWikiText( wfMsg( "emailpagetext" ) );
- if ( $this->subject === "" ) {
- $this->subject = wfMsg( "defemailsubject" );
+ if ( $this->subject === "" ) {
+ $this->subject = wfMsg( "defemailsubject" );
}
$emf = wfMsg( "emailfrom" );
$sender = $wgUser->getName();
$emt = wfMsg( "emailto" );
- $rcpt = str_replace( "_", " ", $this->target );
+ $rcpt = $this->target->getName();
$emr = wfMsg( "emailsubject" );
$emm = wfMsg( "emailmessage" );
$ems = wfMsg( "emailsend" );
$encSubject = htmlspecialchars( $this->subject );
-
+
$titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
$action = $titleObj->escapeLocalURL( "target=" .
- urlencode( $this->target ) . "&action=submit" );
+ urlencode( $this->target->getName() ) . "&action=submit" );
$token = $wgUser->editToken();
$wgOut->addHTML( "
<form id=\"emailuser\" method=\"post\" action=\"{$action}\">
-<table border='0'><tr>
+<table border='0' id='mailheader'><tr>
<td align='right'>{$emf}:</td>
<td align='left'><strong>" . htmlspecialchars( $sender ) . "</strong></td>
</tr><tr>
</tr><tr>
<td align='right'>{$emr}:</td>
<td align='left'>
-<input type='text' name=\"wpSubject\" value=\"{$encSubject}\" />
+<input type='text' size='60' maxlength='200' name=\"wpSubject\" value=\"{$encSubject}\" />
</td>
-</tr><tr>
-<td align='right'>{$emm}:</td>
-<td align='left'>
-<textarea name=\"wpText\" rows='10' cols='60' wrap='virtual'>" . htmlspecialchars( $this->text ) .
+</tr>
+</table>
+<span id='wpTextLabel'><label for=\"wpText\">{$emm}:</label><br /></span>
+<textarea name=\"wpText\" rows='20' cols='80' wrap='virtual' style=\"width: 100%;\">" . htmlspecialchars( $this->text ) .
"</textarea>
-</td></tr><tr>
-<td> </td><td align='left'>
<input type='submit' name=\"wpSend\" value=\"{$ems}\" />
-</td></tr></table>
<input type='hidden' name='wpEditToken' value=\"$token\" />
</form>\n" );
}
function doSubmit() {
- global $wgOut, $wgUser, $wgLang, $wgOutputEncoding;
-
- $from = wfQuotedPrintable( $wgUser->getName() ) . " <" . $wgUser->getEmail() . ">";
- $subject = wfQuotedPrintable( $this->subject );
-
- if (wfRunHooks('EmailUser', $this->mAddress, $from, $subject, $this->text)) {
-
- $mailResult = userMailer( $this->mAddress, $from, $subject, $this->text );
-
- if (!$mailResult) {
+ global $wgOut, $wgUser;
+
+ $to = new MailAddress( $this->target );
+ $from = new MailAddress( $wgUser );
+ $subject = $this->subject;
+
+ if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
+
+ $mailResult = userMailer( $to, $from, $subject, $this->text );
+
+ if( WikiError::isError( $mailResult ) ) {
+ $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
+ } else {
$titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
- $encTarget = wfUrlencode( $this->target );
+ $encTarget = wfUrlencode( $this->target->getName() );
$wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
- wfRunHooks('EmailUserComplete', $this->mAddress, $from, $subject, $this->text);
- } else {
- $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
+ wfRunHooks( 'EmailUserComplete', array( $to, $from, $subject, $this->text ) );
}
}
}
- function showSuccess() {
- global $wgOut, $wgUser;
+ function showSuccess( &$user ) {
+ global $wgOut;
$wgOut->setPagetitle( wfMsg( "emailsent" ) );
$wgOut->addHTML( wfMsg( "emailsenttext" ) );
- $wgOut->returnToMain( false );
+ $wgOut->returnToMain( false, $user->getUserPage() );
}
}
?>