require_once('UserMailer.php');
function wfSpecialEmailuser( $par ) {
- global $wgUser, $wgOut, $wgRequest;
+ global $wgUser, $wgOut, $wgRequest, $wgEnableEmail, $wgEnableUserEmail;
- if ( 0 == $wgUser->getID() ||
- ( false === strpos( $wgUser->getEmail(), "@" ) ) ) {
+ if( !( $wgEnableEmail && $wgEnableUserEmail ) ) {
+ $wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
+ return;
+ }
+
+ if ( $wgUser->isAnon() ||
+ ( !$wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) ) {
$wgOut->errorpage( "mailnologin", "mailnologintext" );
return;
}
return;
}
$nu = User::newFromName( $nt->getText() );
- $id = $nu->idForName();
- if ( 0 == $id ) {
+ if ( 0 == $nu->getID() ) {
$wgOut->errorpage( "noemailtitle", "noemailtext" );
return;
}
- $nu->setID( $id );
+
$address = $nu->getEmail();
- if ( ( false === strpos( $address, "@" ) ) ||
- ( 1 == $nu->getOption( "disablemail" ) ) ) {
+ if ( ( !$nu->isValidEmailAddr( $address ) ) ||
+ ( 1 == $nu->getOption( "disablemail" ) ) ||
+ ( 0 == $nu->getEmailauthenticationtimestamp() ) ) {
$wgOut->errorpage( "noemailtitle", "noemailtext" );
return;
}
$f = new EmailUserForm( $nu->getName() . " <{$address}>", $target );
- if ( "success" == $action ) { $f->showSuccess(); }
- else if ( "submit" == $action && $wgRequest->wasPosted() ) { $f->doSubmit(); }
- else { $f->showForm( "" ); }
+ if ( "success" == $action ) {
+ $f->showSuccess();
+ } else if ( "submit" == $action && $wgRequest->wasPosted() &&
+ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+ $f->doSubmit();
+ } else {
+ $f->showForm();
+ }
}
/**
$this->subject = $wgRequest->getText( 'wpSubject' );
}
- function showForm( $err ) {
+ function showForm() {
global $wgOut, $wgUser, $wgLang;
$wgOut->setPagetitle( wfMsg( "emailpage" ) );
$encSubject = htmlspecialchars( $this->subject );
$titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
- $action = $titleObj->escapeLocalURL( "target={$this->target}&action=submit" );
+ $action = $titleObj->escapeLocalURL( "target=" .
+ urlencode( $this->target ) . "&action=submit" );
+ $token = $wgUser->editToken();
- if ( "" != $err ) {
- $wgOut->setSubtitle( wfMsg( "formerror" ) );
- $wgOut->addHTML( "<p><font color='red' size='+1'>{$err}</font></p>\n" );
- }
$wgOut->addHTML( "
<form id=\"emailuser\" method=\"post\" action=\"{$action}\">
<table border='0'><tr>
<td align='right'>{$emf}:</td>
-<td align='left'><strong>{$sender}</strong></td>
+<td align='left'><strong>" . htmlspecialchars( $sender ) . "</strong></td>
</tr><tr>
<td align='right'>{$emt}:</td>
-<td align='left'><strong>{$rcpt}</strong></td>
+<td align='left'><strong>" . htmlspecialchars( $rcpt ) . "</strong></td>
</tr><tr>
<td align='right'>{$emr}:</td>
<td align='left'>
<td> </td><td align='left'>
<input type='submit' name=\"wpSend\" value=\"{$ems}\" />
</td></tr></table>
+<input type='hidden' name='wpEditToken' value=\"$token\" />
</form>\n" );
}
global $wgOut, $wgUser, $wgLang, $wgOutputEncoding;
$from = wfQuotedPrintable( $wgUser->getName() ) . " <" . $wgUser->getEmail() . ">";
+ $subject = wfQuotedPrintable( $this->subject );
- $mailResult = userMailer( $this->mAddress, $from, wfQuotedPrintable( $this->subject ), $this->text );
-
- if (! $mailResult)
- {
- $titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
- $encTarget = wfUrlencode( $this->target );
- $wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
+ if (wfRunHooks('EmailUser', array(&$this->mAddress, &$from, &$subject, &$this->text))) {
+
+ $mailResult = userMailer( $this->mAddress, $from, $subject, $this->text );
+
+ if (!$mailResult) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
+ $encTarget = wfUrlencode( $this->target );
+ $wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
+ wfRunHooks('EmailUserComplete', array($this->mAddress, $from, $subject, $this->text));
+ } else {
+ $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
+ }
}
- else
- $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
}
function showSuccess() {