X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=389b6301e16399381217bd05715928b3cc57d6f4;hb=960ed6ad88bc05c53961099a281c0feab2768264;hp=8fb300d73c720c297753bd5016cee8f94fd3e3c9;hpb=554bbccf31b5802c2ac0ec7ccd994cadc748dec8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 8fb300d73c..389b6301e1 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -1,9 +1,5 @@
 <?php
 /**
- * UserMailer.php
- *  Copyright (C) 2004 Thomas Gries <mail@tgries.de>
- * http://www.mediawiki.org/
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -16,102 +12,231 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
- * 
+ *
  * @author <brion@pobox.com>
  * @author <mail@tgries.de>
- * 
- * @package MediaWiki
+ * @author Tim Starling
+ *
  */
 
-require_once( 'WikiError.php' );
 
 /**
- * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
+ * Stores a single person's name and email address.
+ * These are passed in via the constructor, and will be returned in SMTP
+ * header format when requested.
  */
-function wfRFC822Phrase( $phrase ) {
-	$phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) );
-	return '"' . $phrase . '"';
+class MailAddress {
+	/**
+	 * @param mixed $address String with an email address, or a User object
+	 * @param string $name Human-readable name if a string address is given
+	 */
+	function __construct( $address, $name=null ) {
+		if( is_object( $address ) && $address instanceof User ) {
+			$this->address = $address->getEmail();
+			$this->name = $address->getName();
+		} else {
+			$this->address = strval( $address );
+			$this->name = strval( $name );
+		}
+	}
+
+	/**
+	 * Return formatted and quoted address to insert into SMTP headers
+	 * @return string
+	 */
+	function toString() {
+		# PHP's mail() implementation under Windows is somewhat shite, and
+		# can't handle "Joe Bloggs <joe@bloggs.com>" format email addresses,
+		# so don't bother generating them
+		if( $this->name != '' && !wfIsWindows() ) {
+			$quoted = wfQuotedPrintable( $this->name );
+			if( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) {
+				$quoted = '"' . $quoted . '"';
+			}
+			return "$quoted <{$this->address}>";
+		} else {
+			return $this->address;
+		}
+	}
+
+	function __toString() {
+		return $this->toString();
+	}
 }
 
+
 /**
- * This function will perform a direct (authenticated) login to
- * a SMTP Server to use for mail relaying if 'wgSMTP' specifies an
- * array of parameters. It requires PEAR:Mail to do that.
- * Otherwise it just uses the standard PHP 'mail' function.
- *
- * @param string $to recipient's email
- * @param string $from sender's email
- * @param string $subject email's subject
- * @param string $body email's text
- * @param string $replyto optional reply-to email (default : false)
+ * Collection of static functions for sending mail
  */
-function userMailer( $to, $from, $subject, $body, $replyto=false ) {
-	global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEmergencyContact;
-	
-	if (is_array( $wgSMTP )) {
-		require_once( 'Mail.php' );
-		
-		$timestamp = time();
-	
-		$headers['From'] = $from;
-		if ( $replyto ) {
-			$headers['Reply-To'] = $replyto;
-		}
-		$headers['Subject'] = $subject;
-		$headers['MIME-Version'] = '1.0';
-		$headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
-		$headers['Content-transfer-encoding'] = '8bit';
-		$headers['Message-ID'] = "<{$timestamp}" . $wgUser->getName() . '@' . $wgSMTP['IDHost'] . '>';
-		$headers['X-Mailer'] = 'MediaWiki mailer';
-	
-		// Create the mail object using the Mail::factory method
-		$mail_object =& Mail::factory('smtp', $wgSMTP);
-	
-		$mailResult =& $mail_object->send($to, $headers, $body);
-		
-		# Based on the result return an error string, 
-		if ($mailResult === true)
+class UserMailer {
+	/**
+	 * Send mail using a PEAR mailer
+	 */
+	protected static function sendWithPear($mailer, $dest, $headers, $body)
+	{
+		$mailResult =& $mailer->send($dest, $headers, $body);
+
+		# Based on the result return an error string,
+		if ($mailResult === true) {
 			return '';
-		else if (is_object($mailResult))
+		} elseif (is_object($mailResult)) {
+			wfDebug( "PEAR::Mail failed: " . $mailResult->getMessage() . "\n" );
 			return $mailResult->getMessage();
-		else
+		} else {
+			wfDebug( "PEAR::Mail failed, unknown error result\n" );
 			return 'Mail object return unknown error.';
-	} else	{
-		# In the following $headers = expression we removed "Reply-To: {$from}\r\n" , because it is treated differently
-		# (fifth parameter of the PHP mail function, see some lines below)
-		$headers =
-			"MIME-Version: 1.0\n" .
-			"Content-type: text/plain; charset={$wgOutputEncoding}\n" .
-			"Content-Transfer-Encoding: 8bit\n" .
-			"X-Mailer: MediaWiki mailer\n".
-			'From: ' . $from . "\n";
-		if ($replyto) {
-			$headers .= "Reply-To: $replyto\n";
 		}
+	}
 
-		$wgErrorString = '';
-		set_error_handler( 'mailErrorHandler' );
-		# added -f parameter, see PHP manual for the fifth parameter when using the mail function
-		mail( $to, $subject, $body, $headers, "-f{$wgEmergencyContact}\n");
-		restore_error_handler();
+	/**
+	 * This function will perform a direct (authenticated) login to
+	 * a SMTP Server to use for mail relaying if 'wgSMTP' specifies an
+	 * array of parameters. It requires PEAR:Mail to do that.
+	 * Otherwise it just uses the standard PHP 'mail' function.
+	 *
+	 * @param $to MailAddress: recipient's email
+	 * @param $from MailAddress: sender's email
+	 * @param $subject String: email's subject.
+	 * @param $body String: email's text.
+	 * @param $replyto String: optional reply-to email (default: null).
+	 */
+	static function send( $to, $from, $subject, $body, $replyto=null ) {
+		global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
+		global $wgEnotifMaxRecips;
 
-		if ( $wgErrorString ) {
-			wfDebug( "Error sending mail: $wgErrorString\n" );
+		if ( is_array( $to ) ) {
+			wfDebug( __METHOD__.': sending mail to ' . implode( ',', $to ) . "\n" );
+		} else {
+			wfDebug( __METHOD__.': sending mail to ' . implode( ',', array( $to->toString() ) ) . "\n" );
+		}
+
+		if (is_array( $wgSMTP )) {
+			require_once( 'Mail.php' );
+
+			$msgid = str_replace(" ", "_", microtime());
+			if (function_exists('posix_getpid'))
+				$msgid .= '.' . posix_getpid();
+
+			if (is_array($to)) {
+				$dest = array();
+				foreach ($to as $u)
+					$dest[] = $u->address;
+			} else
+				$dest = $to->address;
+
+			$headers['From'] = $from->toString();
+
+			if ($wgEnotifImpersonal)
+				$headers['To'] = 'undisclosed-recipients:;';
+			else
+				$headers['To'] = $to->toString();
+
+			if ( $replyto ) {
+				$headers['Reply-To'] = $replyto->toString();
+			}
+			$headers['Subject'] = wfQuotedPrintable( $subject );
+			$headers['Date'] = date( 'r' );
+			$headers['MIME-Version'] = '1.0';
+			$headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
+			$headers['Content-transfer-encoding'] = '8bit';
+			$headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
+			$headers['X-Mailer'] = 'MediaWiki mailer';
+
+			// Create the mail object using the Mail::factory method
+			$mail_object =& Mail::factory('smtp', $wgSMTP);
+			if( PEAR::isError( $mail_object ) ) {
+				wfDebug( "PEAR::Mail factory failed: " . $mail_object->getMessage() . "\n" );
+				return $mail_object->getMessage();
+			}
+
+			wfDebug( "Sending mail via PEAR::Mail to $dest\n" );
+			if (is_array($dest)) {
+				$chunks = array_chunk($dest, $wgEnotifMaxRecips);
+				foreach ($chunks as $chunk) {
+					$e = self::sendWithPear($mail_object, $chunk, $headers, $body);
+					if ($e != '')
+						return $e;
+				}
+			} else
+				return $mail_object->send($dest, $headers, $body);
+
+		} else	{
+			# In the following $headers = expression we removed "Reply-To: {$from}\r\n" , because it is treated differently
+			# (fifth parameter of the PHP mail function, see some lines below)
+
+			# Line endings need to be different on Unix and Windows due to 
+			# the bug described at http://trac.wordpress.org/ticket/2603
+			if ( wfIsWindows() ) {
+				$body = str_replace( "\n", "\r\n", $body );
+				$endl = "\r\n";
+			} else {
+				$endl = "\n";
+			}
+			$headers =
+				"MIME-Version: 1.0$endl" .
+				"Content-type: text/plain; charset={$wgOutputEncoding}$endl" .
+				"Content-Transfer-Encoding: 8bit$endl" .
+				"X-Mailer: MediaWiki mailer$endl".
+				'From: ' . $from->toString();
+			if ($replyto) {
+				$headers .= "{$endl}Reply-To: " . $replyto->toString();
+			}
+
+			$wgErrorString = '';
+			$html_errors = ini_get( 'html_errors' );
+			ini_set( 'html_errors', '0' );
+			set_error_handler( array( 'UserMailer', 'errorHandler' ) );
+			wfDebug( "Sending mail via internal mail() function\n" );
+
+			if (function_exists('mail')) {
+				if (is_array($to)) {
+					foreach ($to as $recip) {
+						$sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+					}
+				} else {
+					$sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+				}
+			} else {
+				$wgErrorString = 'PHP is not configured to send mail';
+			}
+
+			restore_error_handler();
+			ini_set( 'html_errors', $html_errors );
+
+			if ( $wgErrorString ) {
+				wfDebug( "Error sending mail: $wgErrorString\n" );
+				return $wgErrorString;
+			} elseif (! $sent) {
+				//mail function only tells if there's an error
+				wfDebug( "Error sending mail\n" );
+				return 'mailer error';
+			} else {
+				return '';
+			}
 		}
-		return $wgErrorString;
 	}
-}
 
-/**
- * @todo document
- */
-function mailErrorHandler( $code, $string ) {
-	global $wgErrorString;
-	$wgErrorString = preg_replace( "/^mail\(\): /", "", $string );
-}
+	/**
+	 * Get the mail error message in global $wgErrorString
+	 *
+	 * @param $code Integer: error number
+	 * @param $string String: error message
+	 */
+	static function errorHandler( $code, $string ) {
+		global $wgErrorString;
+		$wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
+	}
 
+	/**
+	 * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
+	 */
+	static function rfc822Phrase( $phrase ) {
+		$phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) );
+		return '"' . $phrase . '"';
+	}
+}
 
 /**
  * This module processes the email notifications when the current page is
@@ -130,130 +255,191 @@ function mailErrorHandler( $code, $string ) {
  * same timeoffset in their preferences.
  *
  * Visit the documentation pages under http://meta.wikipedia.com/Enotif
- * 
- * @package MediaWiki
- * 
+ *
+ *
  */
 class EmailNotification {
-	/**#@+
-	 * @access private
+	/**@{{
+	 * @private
 	 */
 	var $to, $subject, $body, $replyto, $from;
 	var $user, $title, $timestamp, $summary, $minorEdit, $oldid;
-	
-	/**#@-*/
-	
+	var $mailTargets = array();
+
+	/**@}}*/
+
 	/**
-	 * @todo document
-	 * @param $currentPage
-	 * @param $currentNs
+	 * Send emails corresponding to the user $editor editing the page $title. 
+	 * Also updates wl_notificationtimestamp.
+	 *
+	 * May be deferred via the job queue.
+	 *
+	 * @param $editor User object
+	 * @param $title Title object
 	 * @param $timestamp
-	 * @param $currentSummary
-	 * @param $currentMinorEdit
+	 * @param $summary
+	 * @param $minorEdit
 	 * @param $oldid (default: false)
 	 */
-	function notifyOnPageChange(&$title, $timestamp, $summary, $minorEdit, $oldid=false) {
+	function notifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid = false) {
+		global $wgEnotifUseJobQ;
 	
+		if( $title->getNamespace() < 0 )
+			return;
+
+		if ($wgEnotifUseJobQ) {
+			$params = array(
+				"editor" => $editor->getName(),
+				"timestamp" => $timestamp,
+				"summary" => $summary,
+				"minorEdit" => $minorEdit,
+				"oldid" => $oldid);
+			$job = new EnotifNotifyJob( $title, $params );
+			$job->insert();
+		} else {
+			$this->actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid);
+		}
+
+	}
+
+	/*
+	 * Immediate version of notifyOnPageChange(). 
+	 *
+	 * Send emails corresponding to the user $editor editing the page $title. 
+	 * Also updates wl_notificationtimestamp.
+	 *
+	 * @param $editor User object
+	 * @param $title Title object
+	 * @param $timestamp
+	 * @param $summary
+	 * @param $minorEdit
+	 * @param $oldid (default: false)
+	 */
+	function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid=false) {
+
 		# we use $wgEmergencyContact as sender's address
-		global $wgUser, $wgLang, $wgEmergencyContact;
-		global $wgEnotifWatchlist, $wgEnotifMinorEdits;
-		global $wgEnotifUserTalk;
-		global $wgEnotifRevealEditorAddress;
-		global $wgEnotifFromEditor;
-		global $wgEmailAuthentication;
+		global $wgEnotifWatchlist;
+		global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker;
+		global $wgEnotifImpersonal;
+
+		wfProfileIn( __METHOD__ );
 
 		# The following code is only run, if several conditions are met:
 		# 1. EmailNotification for pages (other than user_talk pages) must be enabled
 		# 2. minor edits (changes) are only regarded if the global flag indicates so
-	
+
 		$isUserTalkPage = ($title->getNamespace() == NS_USER_TALK);
 		$enotifusertalkpage = ($isUserTalkPage && $wgEnotifUserTalk);
-		$enotifwatchlistpage = (!$isUserTalkPage && $wgEnotifWatchlist);	
+		$enotifwatchlistpage = $wgEnotifWatchlist;
 
-		if ( ($enotifusertalkpage || $enotifwatchlistpage)
-			&& (!$minorEdit || $wgEnotifMinorEdits) ) {
-	
-			$dbr =& wfGetDB( DB_MASTER );
-			extract( $dbr->tableNames( 'watchlist' ) );
-			$sql = "SELECT wl_user FROM $watchlist
-				WHERE wl_title='" . $dbr->strencode($title->getDBkey()).
-				"'  AND wl_namespace = " . $title->getNamespace() .
-				" AND wl_user <>" . $wgUser->getID() . " AND wl_notificationtimestamp <= 1";
-			$res = $dbr->query( $sql,'UserMailer::NotifyOnChange');
-
-			# if anyone is watching ... set up the email message text which is
-			# common for all receipients ...
-			if ( $dbr->numRows( $res ) > 0 ) { 
-				$this->user &= $wgUser;
-				$this->title =& $title;
-				$this->timestamp = $timestamp;
-				$this->summary = $summary;
-				$this->minorEdit = $minorEdit;
-				$this->oldid = $oldid;
-
-				$this->composeCommonMailtext();
-				$watchingUser = new User();
-	
-				# ... now do for all watching users ... if the options fit
-				for ($i = 1; $i <= $dbr->numRows( $res ); $i++) { 
-
-					$wuser = $dbr->fetchObject( $res );
-					$watchingUser->setID($wuser->wl_user);
-					if ( ( $enotifwatchlistpage && $watchingUser->getOption('enotifwatchlistpages') ) ||
-						( $enotifusertalkpage && $watchingUser->getOption('enotifusertalkpages') )
-					&& (!$minorEdit || ($wgEnotifMinorEdits && $watchingUser->getOption('enotifminoredits') ) )
-					&& ($watchingUser->isEmailConfirmed() ) ) {
-						# ... adjust remaining text and page edit time placeholders
-						# which needs to be personalized for each user
-						$this->composeAndSendPersonalisedMail( $watchingUser );
-
-					} # if the watching user has an email address in the preferences
-					# mark the changed watch-listed page with a timestamp, so that the page is listed with an "updated since your last visit" icon in the watch list, ...
-					# ... no matter, if the watching user has or has not indicated an email address in his/her preferences.
-					# We memorise the event of sending out a notification and use this as a flag to suppress further mails for changes on the same page for that watching user
-					$dbw =& wfGetDB( DB_MASTER );
-					$succes = $dbw->update( 'watchlist',
-						array( /* SET */
-							'wl_notificationtimestamp' => $timestamp
-						), array( /* WHERE */
-							'wl_title' => $title->getDBkey(),
-							'wl_namespace' => $title->getNamespace(),
-							'wl_user' => $wuser->wl_user
-						), 'UserMailer::NotifyOnChange'
-					);
-				} # for every watching user
-			} # if anyone is watching
-		} # if $wgEnotifWatchlist = true
+		$this->title = $title;
+		$this->timestamp = $timestamp;
+		$this->summary = $summary;
+		$this->minorEdit = $minorEdit;
+		$this->oldid = $oldid;
+		$this->composeCommonMailtext($editor);
+
+		$userTalkId = false;
+
+		if ( (!$minorEdit || $wgEnotifMinorEdits) ) {
+			if ( $wgEnotifUserTalk && $isUserTalkPage ) {
+				$targetUser = User::newFromName( $title->getText() );
+				if ( !$targetUser || $targetUser->isAnon() ) {
+					wfDebug( __METHOD__.": user talk page edited, but user does not exist\n" );
+				} elseif ( $targetUser->getId() == $editor->getId() ) {
+					wfDebug( __METHOD__.": user edited their own talk page, no notification sent\n" );
+				} elseif( $targetUser->getOption( 'enotifusertalkpages' ) ) {
+					wfDebug( __METHOD__.": sending talk page update notification\n" );
+					$this->compose( $targetUser );
+					$userTalkId = $targetUser->getId();
+				} else {
+					wfDebug( __METHOD__.": talk page owner doesn't want notifications\n" );
+				}
+			}
+
+
+			if ( $wgEnotifWatchlist ) {
+				// Send updates to watchers other than the current editor
+				$userCondition = 'wl_user <> ' . intval( $editor->getId() );
+				if ( $userTalkId !== false ) {
+					// Already sent an email to this person 
+					$userCondition .= ' AND wl_user <> ' . intval( $userTalkId );
+				}
+				$dbr = wfGetDB( DB_SLAVE );
+
+				$res = $dbr->select( 'watchlist', array( 'wl_user' ),
+					array(
+						'wl_title' => $title->getDBkey(),
+						'wl_namespace' => $title->getNamespace(),
+						$userCondition,
+						'wl_notificationtimestamp IS NULL',
+					), __METHOD__ );
+
+				foreach ( $res as $row ) {
+					$watchingUser = User::newFromId( $row->wl_user );
+					if ( $watchingUser->getOption( 'enotifwatchlistpages' ) && 
+						( !$minorEdit || $watchingUser->getOption('enotifminoredits') ) && 
+						$watchingUser->isEmailConfirmed() ) 
+					{
+						$this->compose( $watchingUser );
+					}
+				}
+			}
+		}
+
+		global $wgUsersNotifedOnAllChanges;
+		foreach ( $wgUsersNotifedOnAllChanges as $name ) {
+			$user = User::newFromName( $name );
+			$this->compose( $user );
+		}
+
+		$this->sendMails();
+
+		if ( $wgShowUpdatedMarker || $wgEnotifWatchlist ) {
+			# mark the changed watch-listed page with a timestamp, so that the page is
+			# listed with an "updated since your last visit" icon in the watch list, ...
+			$dbw = wfGetDB( DB_MASTER );
+			$dbw->update( 'watchlist',
+				array( /* SET */
+					'wl_notificationtimestamp' => $dbw->timestamp($timestamp)
+				), array( /* WHERE */
+					'wl_title' => $title->getDBkey(),
+					'wl_namespace' => $title->getNamespace(),
+					'wl_notificationtimestamp IS NULL'
+				), __METHOD__
+			);
+		}
+
+		wfProfileOut( __METHOD__ );
 	} # function NotifyOnChange
-	
+
 	/**
-	 * @access private
+	 * @private
 	 */
-	function composeCommonMailtext() {
-		global $wgLang, $wgUser, $wgEmergencyContact;
-		global $wgEnotifRevealEditorAddress;
-		global $wgEnotifFromEditor;
-		global $wgNoReplyAddress;
-		
+	function composeCommonMailtext($editor) {
+		global $wgEmergencyContact, $wgNoReplyAddress;
+		global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
+		global $wgEnotifImpersonal;
+
 		$summary = ($this->summary == '') ? ' - ' : $this->summary;
 		$medit   = ($this->minorEdit) ? wfMsg( 'minoredit' ) : '';
-		
+
 		# You as the WikiAdmin and Sysops can make use of plenty of
 		# named variables when composing your notification emails while
 		# simply editing the Meta pages
-		
-		$to      = wfMsgForContent( 'enotif_to' );
+
 		$subject = wfMsgForContent( 'enotif_subject' );
 		$body    = wfMsgForContent( 'enotif_body' );
 		$from    = ''; /* fail safe */
 		$replyto = ''; /* fail safe */
 		$keys    = array();
-		
+
 		# regarding the use of oldid as an indicator for the last visited version, see also
 		# http://bugzilla.wikipeda.org/show_bug.cgi?id=603 "Delete + undelete cycle doesn't preserve old_id"
 		# However, in the case of a new page which is already watched, we have no previous version to compare
 		if( $this->oldid ) {
-			$keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited' );
+			$difflink = $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid );
+			$keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink );
 			$keys['$OLDID']   = $this->oldid;
 			$keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' );
 		} else {
@@ -262,74 +448,94 @@ class EmailNotification {
 			$keys['$OLDID']   = '';
 			$keys['$CHANGEDORCREATED'] = wfMsgForContent( 'created' );
 		}
-		
-		$body = strtr( $body, $keys ); 
+
+		if ($wgEnotifImpersonal && $this->oldid)
+			/*
+			 * For impersonal mail, show a diff link to the last 
+			 * revision.
+			 */
+			$keys['$NEWPAGE'] = wfMsgForContent('enotif_lastdiff',
+					$this->title->getFullURL("oldid={$this->oldid}&diff=prev"));
+
+		$body = strtr( $body, $keys );
 		$pagetitle = $this->title->getPrefixedText();
-		
-		$keys['%24PAGETITLE_RAWURL'] = wfUrlencode( $pagetitle );
-		$keys['$PAGETITLE_RAWURL']   = wfUrlencode( $pagetitle );
-		$keys['%24PAGETITLE']        = $pagetitle; # needed for the {{localurl:$PAGETITLE}} in the messagetext, "$" appears here as "%24"
 		$keys['$PAGETITLE']          = $pagetitle;
-		$keys['$PAGETIMESTAMP']      = $article->mTimestamp;	# this is the raw internal timestamp - can be useful, too
-		$keys['$PAGEEDITDATEUTC']    = $wgLang->timeanddate( $article->mTimestamp, false, false, false );
+		$keys['$PAGETITLE_URL']      = $this->title->getFullUrl();
+
 		$keys['$PAGEMINOREDIT']      = $medit;
 		$keys['$PAGESUMMARY']        = $summary;
-	
+
 		$subject = strtr( $subject, $keys );
 
 		# Reveal the page editor's address as REPLY-TO address only if
 		# the user has not opted-out and the option is enabled at the
 		# global configuration level.
-		$name    = $wgUser->getName();
-		$adminAddress = 'WikiAdmin <' . $wgEmergencyContact . '>';
-		$editorAddress = wfRFC822Phrase( $name ) . ' <' . $wgUser->getEmail() . '>';
+		$name    = $editor->getName();
+		$adminAddress = new MailAddress( $wgEmergencyContact, 'WikiAdmin' );
+		$editorAddress = new MailAddress( $editor );
 		if( $wgEnotifRevealEditorAddress
-		    && ( $wgUser->getEmail() != '' )
-		    && $wgUser->getOption( 'enotifrevealaddr' ) ) {
+		    && ( $editor->getEmail() != '' )
+		    && $editor->getOption( 'enotifrevealaddr' ) ) {
 			if( $wgEnotifFromEditor ) {
 				$from    = $editorAddress;
 			} else {
 				$from    = $adminAddress;
 				$replyto = $editorAddress;
 			}
-			$keys['$PAGEEDITORNAMEANDEMAILADDR'] = $editorAddress;
 		} else {
 			$from    = $adminAddress;
-			$replyto = $wgNoReplyAddress;
-			$keys['$PAGEEDITORNAMEANDEMAILADDR'] = $replyto;
+			$replyto = new MailAddress( $wgNoReplyAddress );
 		}
-	
-		if( $wgUser->isIP( $name ) ) {
+
+		if( $editor->isIP( $name ) ) {
 			#real anon (user:xxx.xxx.xxx.xxx)
-			$anon    = $name . ' (anonymous user)';
-			$anonUrl = wfUrlencode( $name ) . ' (anonymous user)';
-			$subject = str_replace('$PAGEEDITOR', 'anonymous user '. $name, $subject);
-			
-			$keys['$PAGEEDITOR_RAWURL']   = $anonUrl;
-			$keys['%24PAGEEDITOR_RAWURL'] = $anonUrl;
-			$keys['%24PAGEEDITORE']       = $anon;
-			$keys['$PAGEEDITORE']         = $anon;
-			$keys['$PAGEEDITOR']          = 'anonymous user ' . $name;
+			$utext = wfMsgForContent('enotif_anon_editor', $name);
+			$subject = str_replace('$PAGEEDITOR', $utext, $subject);
+			$keys['$PAGEEDITOR']       = $utext;
+			$keys['$PAGEEDITOR_EMAIL'] = wfMsgForContent( 'noemailtitle' );
 		} else {
 			$subject = str_replace('$PAGEEDITOR', $name, $subject);
-			$keys['$PAGEEDITOR_RAWURL']   = wfUrlencode( $name );
-			$keys['%24PAGEEDITOR_RAWURL'] = wfUrlencode( $name );
-			$keys['%24PAGEEDITORE']       = $wgUser->getTitleKey();
-			$keys['$PAGEEDITORE']         = $wgUser->getTitleKey();
 			$keys['$PAGEEDITOR']          = $name;
+			$emailPage = SpecialPage::getSafeTitleFor( 'Emailuser', $name );
+			$keys['$PAGEEDITOR_EMAIL'] = $emailPage->getFullUrl();
 		}
+		$userPage = $editor->getUserPage();
+		$keys['$PAGEEDITOR_WIKI'] = $userPage->getFullUrl();
 		$body = strtr( $body, $keys );
-	
+		$body = wordwrap( $body, 72 );
+
 		# now save this as the constant user-independent part of the message
-		$this->to      = $to;
 		$this->from    = $from;
 		$this->replyto = $replyto;
 		$this->subject = $subject;
 		$this->body    = $body;
 	}
 
+	/**
+	 * Compose a mail to a given user and either queue it for sending, or send it now,
+	 * depending on settings.
+	 *
+	 * Call sendMails() to send any mails that were queued.
+	 */
+	function compose( $user ) {
+		global $wgEnotifImpersonal;
+		if ( $wgEnotifImpersonal ) {
+			$this->mailTargets[] = new MailAddress( $user );
+		} else {
+			$this->sendPersonalised( $user );
+		}
+	}
+
+	/**
+	 * Send any queued mails
+	 */
+	function sendMails() {
+		global $wgEnotifImpersonal;
+		if ( $wgEnotifImpersonal ) {
+			$this->sendImpersonal( $this->mailTargets );
+		}
+	}
 
-	
 	/**
 	 * Does the per-user customizations to a notification e-mail (name,
 	 * timestamp in proper timezone, etc) and sends it out.
@@ -338,32 +544,59 @@ class EmailNotification {
 	 * @param User $watchingUser
 	 * @param object $mail
 	 * @return bool
-	 * @access private
+	 * @private
 	 */
-	function composeAndSendPersonalisedMail( $watchingUser ) {
+	function sendPersonalised( $watchingUser ) {
 		global $wgLang;
 		// From the PHP manual:
-		//     Note:  The to parameter cannot be an address in the form of "Something <someone@example.com>". 
+		//     Note:  The to parameter cannot be an address in the form of "Something <someone@example.com>".
 		//     The mail command will not parse this properly while talking with the MTA.
-		$to = $watchingUser->getEmail();
+		$to = new MailAddress( $watchingUser );
 		$body = str_replace( '$WATCHINGUSERNAME', $watchingUser->getName() , $this->body );
-		$body = str_replace( '$WATCHINGUSEREMAILADDR', $watchingUser->getEmail(), $body );
-	
+
 		$timecorrection = $watchingUser->getOption( 'timecorrection' );
-		if( !$timecorrection ) {
-			# fail safe - I prefer it. TomGries
-			$timecorrection = '00:00';
-		}
+
 		# $PAGEEDITDATE is the time and date of the page change
 		# expressed in terms of individual local time of the notification
 		# recipient, i.e. watching user
 		$body = str_replace('$PAGEEDITDATE',
 			$wgLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
 			$body);
+
+		return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto);
+	}
+
+	/**
+	 * Same as sendPersonalised but does impersonal mail suitable for bulk 
+	 * mailing.  Takes an array of MailAddress objects.
+	 */
+	function sendImpersonal( $addresses ) {
+		global $wgLang;
+
+		if (empty($addresses))
+			return;
+
+		$body = str_replace(
+				array(	'$WATCHINGUSERNAME',
+					'$PAGEEDITDATE'),
+				array(	wfMsgForContent('enotif_impersonal_salutation'),
+					$wgLang->timeanddate($this->timestamp, true, false, false)),
+				$this->body);
 		
-		$error = userMailer( $to, $this->from, $this->subject, $body, $this->replyto );
-		return ($error == '');
+		return UserMailer::send($addresses, $this->from, $this->subject, $body, $this->replyto);
 	}
 
 } # end of class EmailNotification
-?>
+
+/**
+ * Backwards compatibility functions
+ */
+function wfRFC822Phrase( $s ) {
+	return UserMailer::rfc822Phrase( $s );
+}
+function userMailer( $to, $from, $subject, $body, $replyto=null ) {
+	return UserMailer::send( $to, $from, $subject, $body, $replyto );
+}
+
+
+