*/
/**
- *
+ * @todo document
*/
-require_once('UserMailer.php');
-
function wfSpecialEmailuser( $par ) {
global $wgUser, $wgOut, $wgRequest, $wgEnableEmail, $wgEnableUserEmail;
return;
}
+ if ( $wgUser->isBlockedFromEmailUser() ) {
+ // User has been blocked from sending e-mail. Show the std blocked form.
+ wfDebug( "User is blocked from sending e-mail.\n" );
+ $wgOut->blockedPage();
+ return;
+ }
+
$f = new EmailUserForm( $nu );
if ( "success" == $action ) {
}
/**
- * @todo document
+ * Implements the Special:Emailuser web interface, and invokes userMailer for sending the email message.
* @addtogroup SpecialPage
*/
class EmailUserForm {
function showForm() {
global $wgOut, $wgUser;
+ $skin = $wgUser->getSkin();
$wgOut->setPagetitle( wfMsg( "emailpage" ) );
- $wgOut->addWikiText( wfMsg( "emailpagetext" ) );
+ $wgOut->addWikiMsg( "emailpagetext" );
if ( $this->subject === "" ) {
- $this->subject = wfMsg( "defemailsubject" );
+ $this->subject = wfMsgForContent( "defemailsubject" );
}
$emf = wfMsg( "emailfrom" );
- $sender = $wgUser->getName();
+ $senderLink = $skin->makeLinkObj(
+ $wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) );
$emt = wfMsg( "emailto" );
- $rcpt = $this->target->getName();
+ $recipientLink = $skin->makeLinkObj(
+ $this->target->getUserPage(), htmlspecialchars( $this->target->getName() ) );
$emr = wfMsg( "emailsubject" );
$emm = wfMsg( "emailmessage" );
$ems = wfMsg( "emailsend" );
$titleObj = SpecialPage::getTitleFor( "Emailuser" );
$action = $titleObj->escapeLocalURL( "target=" .
urlencode( $this->target->getName() ) . "&action=submit" );
- $token = $wgUser->editToken();
+ $token = htmlspecialchars( $wgUser->editToken() );
$wgOut->addHTML( "
<form id=\"emailuser\" method=\"post\" action=\"{$action}\">
<table border='0' id='mailheader'><tr>
<td align='right'>{$emf}:</td>
-<td align='left'><strong>" . htmlspecialchars( $sender ) . "</strong></td>
+<td align='left'><strong>{$senderLink}</strong></td>
</tr><tr>
<td align='right'>{$emt}:</td>
-<td align='left'><strong>" . htmlspecialchars( $rcpt ) . "</strong></td>
+<td align='left'><strong>{$recipientLink}</strong></td>
</tr><tr>
<td align='right'>{$emr}:</td>
<td align='left'>
</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 id=\"wpText\" name=\"wpText\" rows='20' cols='80' style=\"width: 100%;\">" . htmlspecialchars( $this->text ) .
"</textarea>
" . wfCheckLabel( $emc, 'wpCCMe', 'wpCCMe', $wgUser->getBoolOption( 'ccmeonemails' ) ) . "<br />
<input type='submit' name=\"wpSend\" value=\"{$ems}\" />
}
function doSubmit() {
- global $wgOut, $wgUser;
+ global $wgOut, $wgUser, $wgUserEmailUseReplyTo;
$to = new MailAddress( $this->target );
$from = new MailAddress( $wgUser );
$subject = $this->subject;
if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
+
+ if( $wgUserEmailUseReplyTo ) {
+ // Put the generic wiki autogenerated address in the From:
+ // header and reserve the user for Reply-To.
+ //
+ // This is a bit ugly, but will serve to differentiate
+ // wiki-borne mails from direct mails and protects against
+ // SPF and bounce problems with some mailers (see below).
+ global $wgPasswordSender;
+ $mailFrom = new MailAddress( $wgPasswordSender );
+ $replyTo = $from;
+ } else {
+ // Put the sending user's e-mail address in the From: header.
+ //
+ // This is clean-looking and convenient, but has issues.
+ // One is that it doesn't as clearly differentiate the wiki mail
+ // from "directly" sent mails.
+ //
+ // Another is that some mailers (like sSMTP) will use the From
+ // address as the envelope sender as well. For open sites this
+ // can cause mails to be flunked for SPF violations (since the
+ // wiki server isn't an authorized sender for various users'
+ // domains) as well as creating a privacy issue as bounces
+ // containing the recipient's e-mail address may get sent to
+ // the sending user.
+ $mailFrom = $from;
+ $replyTo = null;
+ }
- $mailResult = userMailer( $to, $from, $subject, $this->text );
+ $mailResult = UserMailer::send( $to, $mailFrom, $subject, $this->text, $replyTo );
if( WikiError::isError( $mailResult ) ) {
- $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
+ $wgOut->addHTML( wfMsg( "usermailererror" ) .
+ ' ' . htmlspecialchars( $mailResult->getMessage() ) );
} else {
// if the user requested a copy of this mail, do this now,
if ($this->cc_me && $to != $from) {
$cc_subject = wfMsg('emailccsubject', $this->target->getName(), $subject);
if( wfRunHooks( 'EmailUser', array( &$from, &$from, &$cc_subject, &$this->text ) ) ) {
- $ccResult = userMailer( $from, $from, $cc_subject, $this->text );
+ $ccResult = UserMailer::send( $from, $from, $cc_subject, $this->text );
if( WikiError::isError( $ccResult ) ) {
// At this stage, the user's CC mail has failed, but their
// original mail has succeeded. It's unlikely, but still, what to do?
// We can either show them an error, or we can say everything was fine,
// or we can say we sort of failed AND sort of succeeded. Of these options,
// simply saying there was an error is probably best.
- $wgOut->addHTML( wfMsg( "usermailererror" ) . $ccResult);
+ $wgOut->addHTML( wfMsg( "usermailererror" ) .
+ ' ' . htmlspecialchars( $ccResult->getMessage() ) );
return;
}
}
$wgOut->returnToMain( false, $user->getUserPage() );
}
}
-?>
dépôts / lhc / web / wiklou.git / blobdiff