-<?
+<?php
+
+require_once('UserMailer.php');
function wfSpecialEmailuser()
{
- global $wgUser, $wgOut, $action, $target;
+ global $wgUser, $wgOut, $wgRequest;
if ( 0 == $wgUser->getID() ||
( false === strpos( $wgUser->getEmail(), "@" ) ) ) {
$wgOut->errorpage( "mailnologin", "mailnologintext" );
return;
}
- $target = wfCleanQueryVar( $target );
+ $action = $wgRequest->getVal( 'action' );
+ $target = $wgRequest->getVal( 'target' );
if ( "" == $target ) {
$wgOut->errorpage( "notargettitle", "notargettext" );
return;
$wgOut->errorpage( "noemailtitle", "noemailtext" );
return;
}
- $fields = array( "wpSubject", "wpText" );
- wfCleanFormFields( $fields );
- $f = new EmailUserForm( $nu->getName() . " <{$address}>" );
+ $f = new EmailUserForm( $nu->getName() . " <{$address}>", $target );
if ( "success" == $action ) { $f->showSuccess(); }
- else if ( "submit" == $action ) { $f->doSubmit(); }
+ else if ( "submit" == $action && $wgRequest->wasPosted() ) { $f->doSubmit(); }
else { $f->showForm( "" ); }
}
class EmailUserForm {
var $mAddress;
+ var $target;
+ var $text, $subject;
- function EmailUserForm( $addr )
+ function EmailUserForm( $addr, $target )
{
+ global $wgRequest;
$this->mAddress = $addr;
+ $this->target = $target;
+ $this->text = $wgRequest->getText( 'wpText' );
+ $this->subject = $wgRequest->getText( 'wpSubject' );
}
function showForm( $err )
{
global $wgOut, $wgUser, $wgLang;
- global $wpSubject, $wpText, $target;
$wgOut->setPagetitle( wfMsg( "emailpage" ) );
$wgOut->addWikiText( wfMsg( "emailpagetext" ) );
- if ( ! $wpSubject ) { $wpSubject = wfMsg( "defemailsubject" ); }
+ if ( $this->subject === "" ) {
+ $this->subject = wfMsg( "defemailsubject" );
+ }
$emf = wfMsg( "emailfrom" );
$sender = $wgUser->getName();
$emt = wfMsg( "emailto" );
- $rcpt = str_replace( "_", " ", urldecode( $target ) );
+ $rcpt = str_replace( "_", " ", $this->target );
$emr = wfMsg( "emailsubject" );
$emm = wfMsg( "emailmessage" );
$ems = wfMsg( "emailsend" );
-
- $action = wfLocalUrlE( $wgLang->specialPage( "Emailuser" ),
- "target={$target}&action=submit" );
+ $encSubject = htmlspecialchars( $this->subject );
+
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
+ $action = $titleObj->escapeLocalURL( "target={$this->target}&action=submit" );
if ( "" != $err ) {
$wgOut->setSubtitle( wfMsg( "formerror" ) );
</tr><tr>
<td align=right>{$emr}:</td>
<td align=left>
-<input type=text name=\"wpSubject\" value=\"{$wpSubject}\">
+<input type=text name=\"wpSubject\" value=\"{$encSubject}\">
</td>
</tr><tr>
<td align=right>{$emm}:</td>
<td align=left>
<textarea name=\"wpText\" rows=10 cols=60 wrap=virtual>
-{$wpText}
+{$this->text}
</textarea>
</td></tr><tr>
<td> </td><td align=left>
function doSubmit()
{
global $wgOut, $wgUser, $wgLang, $wgOutputEncoding;
- global $wpSubject, $wpText, $target;
$from = wfQuotedPrintable( $wgUser->getName() ) . " <" . $wgUser->getEmail() . ">";
- $to = wfQuotedPrintable( $this->mAddress );
-
- $headers =
- "MIME-Version: 1.0\r\n" .
- "Content-type: text/plain; charset={$wgOutputEncoding}\r\n" .
- "Content-transfer-encoding: 8bit\r\n" .
- "From: {$from}\r\n" .
- "Reply-To: {$from}\r\n" .
- "To: {$to}\r\n" .
- "X-Mailer: MediaWiki interuser e-mailer";
- mail( $this->mAddress, wfQuotedPrintable( $wpSubject ), $wpText, $headers );
-
-
- $success = wfLocalUrl( $wgLang->specialPage( "Emailuser" ),
- "target={$target}&action=success" );
- $wgOut->redirect( $success );
+
+ $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" ) );
+ }
+ else
+ $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
}
function showSuccess()