Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added VERP functionality hook to core

Browse source 
* By default, wiki should keep the envelope sender as $wgPasswordSender
* Requires BounceHandler extension. Added hook to core
* Alters the return path, to bounce-{key}@domain
* The envelope sender is set using the 5th param in mail()

Bug: 46640
Needed By: I9463ae33ae327405725ea9693d45ad61b8ecf798
Change-Id: Ic5c1231611a5c4984ddf81fd716e6f3a3e82fd57
This commit is contained in:
Tony Thomas 2014-06-11 00:02:42 +05:30 committed by Legoktm
parent 5842d0aa07
commit 9d54bc2055
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/hooks.txt
View file

@ -2969,6 +2969,11 @@ invalidated and GetExtendedMetadata hook called again).
$timestamp: The timestamp metadata was generated $timestamp: The timestamp metadata was generated
$file: The file the metadata is for $file: The file the metadata is for
'UserMailerChangeReturnPath': Called to generate a VERP return address
when UserMailer sends an email, with a bounce handling extension.
$to: Array of MailAddress objects for the recipients
&$returnPath: The return address string
'WantedPages::getQueryInfo': Called in WantedPagesPage::getQueryInfo(), can be 'WantedPages::getQueryInfo': Called in WantedPagesPage::getQueryInfo(), can be
used to alter the SQL query which gets the list of wanted pages. used to alter the SQL query which gets the list of wanted pages.
&$wantedPages: WantedPagesPage object &$wantedPages: WantedPagesPage object

14
includes/UserMailer.php
View file

@ -239,7 +239,17 @@ class UserMailer {
# -- hashar 20120218 # -- hashar 20120218
$headers['From'] = $from->toString(); $headers['From'] = $from->toString();
$headers['Return-Path'] = $from->address; $returnPath = $from->address;
$extraParams = $wgAdditionalMailParams;
// Hook to generate custom VERP address for 'Return-Path'
wfRunHooks( 'UserMailerChangeReturnPath', array( $to, &$returnPath ) );
# Add the envelope sender address using the -f command line option when PHP mail() is used.
# Will default to the $from->address when the UserMailerChangeReturnPath hook fails and the
# generated VERP address when the hook runs effectively.
$extraParams .= ' -f ' . $returnPath;
$headers['Return-Path'] = $returnPath;
if ( $replyto ) { if ( $replyto ) {
$headers['Reply-To'] = $replyto->toString(); $headers['Reply-To'] = $replyto->toString();
@ -371,7 +381,7 @@ class UserMailer {
self::quotedPrintable( $subject ), self::quotedPrintable( $subject ),
$body, $body,
$headers, $headers,
$wgAdditionalMailParams $extraParams
); );
} }
} }