* (bug 10242) Update Chinese translations
[lhc/web/wiklou.git] / includes / UserMailer.php
index d1f9255..d74416f 100644 (file)
@@ -1,57 +1,91 @@
 <?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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-# http://www.gnu.org/copyleft/gpl.html
-**/
-
 /**
- * Provide mail capabilities
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 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
  */
 
-function wfQuotedPrintable_name_and_emailaddr( $string ) {
-       /*      it takes formats like "name <emailaddr>" into account,
-               for which the partial string "name" will be quoted-printable converted
-               but not "<emailaddr>".
-
-               The php mail() function does not accept the email address partial string
-               to be quotedprintable, it does not accept inputs as quotedprintable("name <emailaddr>") .
-
-               case 1:
-               input:  "name <emailaddr> rest"
-               output: "quoted-printable(name) <emailaddr>"
+/**
+ * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
+ */
+function wfRFC822Phrase( $phrase ) {
+       $phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) );
+       return '"' . $phrase . '"';
+}
 
-               case 2: (should not happen)
-               input:  "<emailaddr> rest"
-               output: "<emailaddr>"
+/**
+ * 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.
+ */
+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 );
+               }
+       }
 
-               case 3: (should not happen)
-               input:  "name"
-               output: "quoted-printable(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 ) {
+                               $quoted = '"' . $quoted . '"';
+                       }
+                       return "$quoted <{$this->address}>";
+               } else {
+                       return $this->address;
+               }
+       }
+}
 
-               T. Gries 18.11.2004
-       */
+function send_mail($mailer, $dest, $headers, $body)
+{
+       $mailResult =& $mailer->send($dest, $headers, $body);
 
-       /* do not quote printable for email address string <emailaddr>, but only for the (leading) string, usually the name */
-       preg_match( '/^([^<]*)?(<([A-z0-9_.-]+([A-z0-9_.-]+)*\@[A-z0-9_-]+([A-z0-9_.-]+)*([A-z.]{2,})+)>)?$/', $string, $part );
-       if ( !isset($part[1]) ) return $part[2];
-       if ( !isset($part[2]) ) return wfQuotedprintable($part[1]);
-       return wfQuotedprintable($part[1]) . $part[2] ;
+       # Based on the result return an error string,
+       if ($mailResult === true) {
+               return '';
+       } elseif (is_object($mailResult)) {
+               wfDebug( "PEAR::Mail failed: " . $mailResult->getMessage() . "\n" );
+               return $mailResult->getMessage();
+       } else {
+               wfDebug( "PEAR::Mail failed, unknown error result\n" );
+               return 'Mail object return unknown error.';
+       }
 }
 
 /**
@@ -60,280 +94,444 @@ function wfQuotedPrintable_name_and_emailaddr( $string ) {
  * 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 $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).
  */
-function userMailer( $to, $from, $subject, $body, $replyto=false ) {
-       global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEmergencyContact;
-       
-       $qto = wfQuotedPrintable_name_and_emailaddr( $to );
-       
+function userMailer( $to, $from, $subject, $body, $replyto=null ) {
+       global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
+       global $wgEnotifMaxRecips;
+
        if (is_array( $wgSMTP )) {
                require_once( 'Mail.php' );
-               
-               $timestamp = time();
-       
-               $headers['From'] = $from;
-/* removing to: field as it should be set by the send() function below
-   UNTESTED - Hashar */
-//             $headers['To'] = $qto;
-/* Reply-To:
-   UNTESTED - Tom Gries */
-               $headers['Reply-To'] = $replyto;
-               $headers['Subject'] = $subject;
+
+               $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'] = "<{$timestamp}" . $wgUser->getName() . '@' . $wgSMTP['IDHost'] . '>';
+               $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);
-       
-               $mailResult =& $mail_object->send($to, $headers, $body);
-               
-               # Based on the result return an error string, 
-               if ($mailResult === true)
-                       return '';
-               else if (is_object($mailResult))
-                       return $mailResult->getMessage();
-               else
-                       return 'Mail object return unknown error.';
+               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 = send_mail($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\n" .
-                       "Content-type: text/plain; charset={$wgOutputEncoding}\n" .
-                       "Content-Transfer-Encoding: 8bit\n" .
-                       "X-Mailer: MediaWiki mailer\n".
-                       'From:' . wfQuotedPrintable_name_and_emailaddr($from) . "\n";
+                       "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 .= 'Reply-To: '.wfQuotedPrintable_name_and_emailaddr($replyto)."\n";
+                       $headers .= "{$endl}Reply-To: " . $replyto->toString();
                }
 
                $wgErrorString = '';
                set_error_handler( 'mailErrorHandler' );
-               # added -f parameter, see PHP manual for the fifth parameter when using the mail function
-               mail( wfQuotedPrintable_name_and_emailaddr($to), $subject, $body, $headers, "-f{$wgEmergencyContact}\n");
+               wfDebug( "Sending mail via internal mail() function\n" );
+
+               if (is_array($to))
+                       foreach ($to as $recip)
+                               mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+               else
+                       mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+
                restore_error_handler();
 
+               if ( $wgErrorString ) {
+                       wfDebug( "Error sending mail: $wgErrorString\n" );
+               }
                return $wgErrorString;
        }
 }
 
 /**
+ * Get the mail error message in global $wgErrorString
  *
+ * @param $code Integer: error number
+ * @param $string String: error message
  */
 function mailErrorHandler( $code, $string ) {
        global $wgErrorString;
-       $wgErrorString = preg_replace( "/^mail\(\): /", "", $string );
+       $wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
 }
 
+
+/**
+ * This module processes the email notifications when the current page is
+ * changed. It looks up the table watchlist to find out which users are watching
+ * that page.
+ *
+ * The current implementation sends independent emails to each watching user for
+ * the following reason:
+ *
+ * - Each watching user will be notified about the page edit time expressed in
+ * his/her local time (UTC is shown additionally). To achieve this, we need to
+ * find the individual timeoffset of each watching user from the preferences..
+ *
+ * Suggested improvement to slack down the number of sent emails: We could think
+ * of sending out bulk mails (bcc:user1,user2...) for all these users having the
+ * same timeoffset in their preferences.
+ *
+ * Visit the documentation pages under http://meta.wikipedia.com/Enotif
+ *
+ *
+ */
 class EmailNotification {
+       /**@{{
+        * @private
+        */
+       var $to, $subject, $body, $replyto, $from;
+       var $user, $title, $timestamp, $summary, $minorEdit, $oldid;
+
+       /**@}}*/
+
+       function notifyOnPageChange($editor, &$title, $timestamp, $summary, $minorEdit, $oldid = false) {
+               global $wgEnotifUseJobQ;
+               global $wgEnotifWatchlist, $wgShowUpdatedMarker;
+
+               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);
+               }
 
-var $to, $subject, $body, $replyto, $from;
-
-# Patch for email notification on page changes T.Gries/M.Arndt 11.09.2004
-#
-#      This new module processes the email notifications when the current page is changed.
-#      It looks up the table watchlist to find out which users are watching that page.
-#
-#      The current implementation sends independent emails to each watching user for the following reason:
-#
-#      -       Each watching user will be notified about the page edit time expressed in his/her local time (UTC is shown additionally).
-#              To achieve this, we need to find the individual timeoffset of each watching user from the preferences..
-#
-#              Suggested improvement to slack down the number of sent emails:
-#              We could think of sending out bulk mails (bcc:user1,user2...) for all these users having the same timeoffset in their preferences.
-#
-#      -       Visit the documentation pages under http://meta.wikipedia.com/Enotif
-
-function NotifyOnPageChange($currentUser, $currentPage, $currentNs, $timestamp, $currentSummary, $currentMinorEdit, $oldid=false) {
-
-       # we use $wgEmergencyContact as sender's address
-       global $wgUser, $wgLang, $wgEmergencyContact;
-       global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForMinorEdits;
-       global $wgEmailNotificationSystembeep, $wgEmailNotificationForUserTalkPages;
-       global $wgEmailNotificationRevealPageEditorAddress;
-       global $wgEmailNotificationMailsSentFromPageEditor;
-       global $wgEmailAuthentication;
-       global $beeped;
-
-       # 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 = ($currentNs == NS_USER_TALK);
-       $enotifusertalkpage = ($isUserTalkPage && $wgEmailNotificationForUserTalkPages);
-       $enotifwatchlistpage = (!$isUserTalkPage && $wgEmailNotificationForWatchlistPages);
-
-       if ( ($enotifusertalkpage || $enotifwatchlistpage)
-               && (!$currentMinorEdit || $wgEmailNotificationForMinorEdits) ) {
-
-               $dbr =& wfGetDB( DB_MASTER );
-               extract( $dbr->tableNames( 'watchlist' ) );
-               $sql = "SELECT wl_user FROM $watchlist
-                       WHERE wl_title='" . $dbr->strencode($currentPage)."'  AND wl_namespace = " . $currentNs .
-                       " AND wl_user <>" . $currentUser . " AND wl_notificationtimestamp <= 1";
-               $res = $dbr->query( $sql,'UserMailer::NotifyOnChange');
-
-               if ( $dbr->numRows( $res ) > 0 ) { # if anyone is watching ... set up the email message text which is common for all receipients ...
-
-                       # This is a switch for one beep on the server when sending notification mails
-                       $beeped = false;
-
-                       $article->mTimestamp = $timestamp;
-                       $article->mSummary = $currentSummary;
-                       $article->mMinorEdit = $currentMinorEdit;
-                       $article->mNamespace = $currentNs;
-                       $article->mTitle = $currentPage;
-                       $article->mOldid = $oldid;
-
-                       $mail = $this->ComposeCommonMailtext( $wgUser, $article );
-                       $watchingUser = new User();
-
-                       for ($i = 1; $i <= $dbr->numRows( $res ); $i++) { # ... now do for all watching users ... if the options fit
-
-                               $wuser = $dbr->fetchObject( $res );
-                               $watchingUser->setID($wuser->wl_user);
-                               if ( ( $enotifwatchlistpage && $watchingUser->getOption('enotifwatchlistpages') ) ||
-                                       ( $enotifusertalkpage && $watchingUser->getOption('enotifusertalkpages') )
-                               && (!$currentMinorEdit || ($wgEmailNotificationForMinorEdits && $watchingUser->getOption('enotifminoredits') ) )
-                               && ($watchingUser->getEmail() != '')
-                               && (!$wgEmailAuthentication || ($watchingUser->getEmailAuthenticationtimestamp() != 0 ) ) ) {
-                                       # ... adjust remaining text and page edit time placeholders
-                                       # which needs to be personalized for each user
-                                       $sent = $this->ComposeAndSendPersonalisedMail( $watchingUser, $mail, $article );
-                                       /* the beep here beeps once when a watched-listed page is changed */
-                                       if ($sent && !$beeped && ($wgEmailNotificationSystembeep != '') ) {
-                                               $last_line = system($wgEmailNotificationSystembeep);
-                                               $beeped=true;
-                                       }
-                               } # 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' => $article->mTimestamp
-                                       ), array( /* WHERE */
-                                               'wl_title' => $currentPage,
-                                               'wl_namespace' => $currentNs,
-                                               'wl_user' => $wuser->wl_user
-                                       ), 'UserMailer::NotifyOnChange'
-                               );
-                       } # for every watching user
-               } # if anyone is watching
-       } # if $wgEmailNotificationForWatchlistPages = true
-} # function NotifyOnChange
-
-function ComposeCommonMailtext ( $pageeditorUser, $article ) {
-
-       global $wgLang, $wgEmergencyContact;
-       global $wgEmailNotificationRevealPageEditorAddress, $wgEmailNotificationMailsSentFromPageEditor;
-       global $wgNoReplyAddress;
-
-       $summary = ($article->mSummary == '') ? ' - ' : $article->mSummary;
-       $medit = ($article->mMinorEdit) ? 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             = wfMsg( 'email_notification_to' );
-       $subject        = wfMsg( 'email_notification_subject' );
-       $body           = wfMsg( 'email_notification_body' );
-       $from           = ''; /* fail safe */
-       $replyto        = ''; /* fail safe */
-
-       # 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 ($article->mOldid) {
-               $body = str_replace('$NEWPAGE', wfMsg( 'email_notification_lastvisitedrevisiontext' ), $body);
-               $body = str_replace('$OLDID', $article->mOldid , $body);
-       } else {
-               $body = str_replace('$NEWPAGE', wfMsg( 'email_notification_newpagetext' ), $body );
-               $body = str_replace('$OLDID', '', $body); # clear $OLDID placeholder in the message template
        }
 
-       $pagetitle = $article->mTitle;
-       if ($article->mNamespace != 0) { $pagetitle = $wgLang->getNsText($article->mNamespace).':'.$pagetitle; };
-       $subject = str_replace('$PAGETITLE_QP', wfQuotedPrintable(str_replace( '_', ' ', $pagetitle)), $subject);
-       $body = str_replace('%24PAGETITLE_RAWURL', wfUrlencode($pagetitle), $body);
-       $body = str_replace('$PAGETITLE_RAWURL', wfUrlencode($pagetitle), $body);
-       $body = str_replace('%24PAGETITLE', $pagetitle, $body); # needed for the {{localurl:$PAGETITLE}} in the messagetext, "$" appears here as "%24"
-       $body = str_replace('$PAGETITLE', $pagetitle, $body);
-       $body = str_replace('$PAGETIMESTAMP', $article->mTimestamp, $body);     # this is the raw internal timestamp - can be useful, too
-       $body = str_replace('$PAGEEDITDATEUTC', $wgLang->timeanddate( $article->mTimestamp, false, false, false, true ), $body);
-       $body = str_replace('$PAGEMINOREDIT', $medit,$body);
-       $body = str_replace('$PAGESUMMARY', $summary, $body);
-
-       $pageeditor_qp = wfQuotedPrintable($pageeditorUser->getName());
-       # the user who edited is $pageeditorUser->getName():
-       # reveal the page editor's address as REPLY-TO address only if the user has not opted-out
-       if (($pageeditorUser->getEmail() != '')
-       && $pageeditorUser->getOption('enotifrevealaddr')
-       && $wgEmailNotificationRevealPageEditorAddress ) {
-               if ($wgEmailNotificationMailsSentFromPageEditor) {
-                       $from = $pageeditorUser->getName().' <'.$pageeditorUser->getEmail().'>';
-               } else {
-                       $from = 'WikiAdmin <'.$wgEmergencyContact.'>';
-                       if ($wgEmailNotificationRevealPageEditorAddress) {
-                               $replyto = $pageeditorUser->getName().' <'.$pageeditorUser->getEmail().'>';
+       /**
+        * @todo document
+        * @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 $wgEnotifWatchlist;
+               global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker;
+               global $wgEnotifImpersonal;
+
+               $fname = 'UserMailer::notifyOnPageChange';
+               wfProfileIn( $fname );
+
+               # 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 = $wgEnotifWatchlist;
+
+               $this->title =& $title;
+               $this->timestamp = $timestamp;
+               $this->summary = $summary;
+               $this->minorEdit = $minorEdit;
+               $this->oldid = $oldid;
+               $this->composeCommonMailtext($editor);
+
+               $impersonals = array();
+
+               if ( (!$minorEdit || $wgEnotifMinorEdits) ) {
+                       if( $wgEnotifWatchlist ) {
+                               // Send updates to watchers other than the current editor
+                               $userCondition = 'wl_user <> ' . intval( $editor->getId() );
+                       } elseif( $wgEnotifUserTalk && $title->getNamespace() == NS_USER_TALK ) {
+                               $targetUser = User::newFromName( $title->getText() );
+                               if( is_null( $targetUser ) ) {
+                                       wfDebug( "$fname: user-talk-only mode; no such user\n" );
+                                       $userCondition = false;
+                               } elseif( $targetUser->getId() == $editor->getId() ) {
+                                       wfDebug( "$fname: user-talk-only mode; editor is target user\n" );
+                                       $userCondition = false;
+                               } else {
+                                       // Don't notify anyone other than the owner of the talk page
+                                       $userCondition = 'wl_user = ' . intval( $targetUser->getId() );
+                               }
+                       } else {
+                               // Notifications disabled
+                               $userCondition = false;
                        }
+                       if( $userCondition ) {
+                               $dbr = wfGetDB( DB_MASTER );
+
+                               $res = $dbr->select( 'watchlist', array( 'wl_user' ),
+                                       array(
+                                               'wl_title' => $title->getDBkey(),
+                                               'wl_namespace' => $title->getNamespace(),
+                                               $userCondition,
+                                               'wl_notificationtimestamp IS NULL',
+                                       ), $fname );
+
+                               # if anyone is watching ... set up the email message text which is
+                               # common for all receipients ...
+                               if ( $dbr->numRows( $res ) > 0 ) {
+
+                                       $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')
+                                                               && $title->equals( $watchingUser->getTalkPage() ) )
+                                               && (!$minorEdit || ($wgEnotifMinorEdits && $watchingUser->getOption('enotifminoredits') ) )
+                                               && ($watchingUser->isEmailConfirmed() ) ) {
+                                                       # ... adjust remaining text and page edit time placeholders
+                                                       # which needs to be personalized for each user
+                                                       if ($wgEnotifImpersonal)
+                                                               $impersonals[] = $watchingUser;
+                                                       else
+                                                               $this->composeAndSendPersonalisedMail( $watchingUser );
+
+                                               } # if the watching user has an email address in the preferences
+                                       }
+                               }
+                       } # if anyone is watching
+               } # if $wgEnotifWatchlist = true
+
+               global $wgUsersNotifedOnAllChanges;
+               foreach ( $wgUsersNotifedOnAllChanges as $name ) {
+                       $user = User::newFromName( $name );
+                       if ($wgEnotifImpersonal)
+                               $impersonals[] = $user;
+                       else
+                               $this->composeAndSendPersonalisedMail( $user );
                }
-               $body = str_replace('$PAGEEDITORNAMEANDEMAILADDR', $pageeditorUser->getName().' <'.$pageeditorUser->getEmail().'>', $body);
-       } else {
-               $from = 'WikiAdmin <'.$wgEmergencyContact.'>';
-               $replyto = $wgNoReplyAddress;
-               $body = str_replace('$PAGEEDITORNAMEANDEMAILADDR', $replyto, $body);
-       }
-
-       if ($pageeditorUser->isIP($pageeditorUser->getName())) { #real anon (user:xxx.xxx.xxx.xxx)
-               $subject = str_replace('$PAGEEDITOR_QP', 'anonymous user ' . $pageeditorUser->getName(), $subject);
-               $body = str_replace('$PAGEEDITOR_RAWURL', wfUrlencode($pageeditorUser->getName()) . ' (anonymous user)' , $body);
-               $body = str_replace('%24PAGEEDITOR_RAWURL', wfUrlencode($pageeditorUser->getName()) . ' (anonymous user)' , $body);
-               $body = str_replace('%24PAGEEDITORE', $pageeditorUser->getName() . ' (anonymous user)' , $body);
-               $body = str_replace('$PAGEEDITORE', $pageeditorUser->getName() . ' (anonymous user)' , $body);
-               $body = str_replace('$PAGEEDITOR', 'anonymous user ' . $pageeditorUser->getName(), $body);
-       } else {
-               $subject = str_replace('$PAGEEDITOR_QP', $pageeditor_qp, $subject);
-               $body = str_replace('$PAGEEDITOR_RAWURL', wfUrlencode($pageeditorUser->getName()), $body);
-               $body = str_replace('%24PAGEEDITOR_RAWURL', wfUrlencode($pageeditorUser->getName()), $body);
-               $body = str_replace('%24PAGEEDITORE', str_replace( ' ', '_', $pageeditorUser->getName()), $body);
-               $body = str_replace('$PAGEEDITORE', str_replace( ' ', '_', $pageeditorUser->getName()), $body);
-               $body = str_replace('$PAGEEDITOR',$pageeditorUser->getName(), $body);
-       }
 
-       # 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;
-       return $this;
-}
+               $this->composeAndSendImpersonalMail($impersonals);
+
+               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 );
+                       $success = $dbw->update( 'watchlist',
+                               array( /* SET */
+                                       'wl_notificationtimestamp' => $dbw->timestamp($timestamp)
+                               ), array( /* WHERE */
+                                       'wl_title' => $title->getDBkey(),
+                                       'wl_namespace' => $title->getNamespace(),
+                               ), 'UserMailer::NotifyOnChange'
+                       );
+                       # FIXME what do we do on failure ?
+               }
 
+               wfProfileOut( $fname );
+       } # function NotifyOnChange
+
+       /**
+        * @private
+        */
+       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
+
+               $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 ) {
+                       $difflink = $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid );
+                       $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink );
+                       $keys['$OLDID']   = $this->oldid;
+                       $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' );
+               } else {
+                       $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_newpagetext' );
+                       # clear $OLDID placeholder in the message template
+                       $keys['$OLDID']   = '';
+                       $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'created' );
+               }
 
-function ComposeAndSendPersonalisedMail( $watchingUser, $mail, $article) {
+               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['$PAGETITLE']          = $pagetitle;
+               $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    = $editor->getName();
+               $adminAddress = new MailAddress( $wgEmergencyContact, 'WikiAdmin' );
+               $editorAddress = new MailAddress( $editor );
+               if( $wgEnotifRevealEditorAddress
+                   && ( $editor->getEmail() != '' )
+                   && $editor->getOption( 'enotifrevealaddr' ) ) {
+                       if( $wgEnotifFromEditor ) {
+                               $from    = $editorAddress;
+                       } else {
+                               $from    = $adminAddress;
+                               $replyto = $editorAddress;
+                       }
+               } else {
+                       $from    = $adminAddress;
+                       $replyto = new MailAddress( $wgNoReplyAddress );
+               }
 
-       /* returns true if the mail was sent successfully */
-       global $wgLang;
+               if( $editor->isIP( $name ) ) {
+                       #real anon (user:xxx.xxx.xxx.xxx)
+                       $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']          = $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->from    = $from;
+               $this->replyto = $replyto;
+               $this->subject = $subject;
+               $this->body    = $body;
+       }
 
-       $to = $watchingUser->getName().' <'.$watchingUser->getEmail().'>';
-       $body = str_replace('$WATCHINGUSERNAME', $watchingUser->getName() , $mail->body);
-       $body = str_replace('$WATCHINGUSEREMAILADDR', $watchingUser->getEmail(), $body);
+       /**
+        * Does the per-user customizations to a notification e-mail (name,
+        * timestamp in proper timezone, etc) and sends it out.
+        * Returns true if the mail was sent successfully.
+        *
+        * @param User $watchingUser
+        * @param object $mail
+        * @return bool
+        * @private
+        */
+       function composeAndSendPersonalisedMail( $watchingUser ) {
+               global $wgLang;
+               // From the PHP manual:
+               //     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 = new MailAddress( $watchingUser );
+               $body = str_replace( '$WATCHINGUSERNAME', $watchingUser->getName() , $this->body );
+
+               $timecorrection = $watchingUser->getOption( 'timecorrection' );
+
+               # $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($to, $this->from, $this->subject, $body, $this->replyto);
+       }
 
-       $timecorrection = $watchingUser->getOption('timecorrection');
-       if (!$timecorrection) { $timecorrection = '00:00'; }    # fail safe - I prefer it. TomGries
-       #  $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($article->mTimestamp, true, false, $timecorrection, true), $body);
-       return (userMailer($to, $mail->from, $mail->subject, $body, $mail->replyto) == '');
-}
+       /**
+        * Same as composeAndSendPersonalisedMail but does impersonal mail 
+        * suitable for bulk mailing.  Takes an array of users.
+        */
+       function composeAndSendImpersonalMail($users) {
+               global $wgLang;
+
+               if (empty($users))
+                       return;
+
+               $to = array();
+               foreach ($users as $user)
+                       $to[] = new MailAddress($user);
+
+               $body = str_replace(
+                               array(  '$WATCHINGUSERNAME',
+                                       '$PAGEEDITDATE'),
+                               array(  wfMsgForContent('enotif_impersonal_salutation'),
+                                       $wgLang->timeanddate($this->timestamp, true, false, false)),
+                               $this->body);
+               
+               return userMailer($to, $this->from, $this->subject, $body, $this->replyto);
+       }
 
 } # end of class EmailNotification
 ?>