X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=e0b8d01abba7f7ab9c3bf5feaf583ee970c0ad2c;hb=3d0abce217b73d9e3a0ae79d205cf7c10d957873;hp=edcdcc53bb76c3e640efbc9675b8b48bac289bc6;hpb=a2589ff8c6718dc170db8eb6c08ce656d38df46b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/UserMailer.php b/includes/UserMailer.php index edcdcc53bb..e0b8d01abb 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -31,12 +31,12 @@ */ class MailAddress { /** - * @param $address Mixed: string with an email address, or a User object + * @param $address string|User string with an email address, or a User object * @param $name String: human-readable name if a string address is given * @param $realName String: human-readable real name if a string address is given */ function __construct( $address, $name = null, $realName = null ) { - if( is_object( $address ) && $address instanceof User ) { + if ( is_object( $address ) && $address instanceof User ) { $this->address = $address->getEmail(); $this->name = $address->getName(); $this->realName = $address->getRealName(); @@ -55,16 +55,20 @@ class MailAddress { # PHP's mail() implementation under Windows is somewhat shite, and # can't handle "Joe Bloggs " format email addresses, # so don't bother generating them - if( $this->name != '' && !wfIsWindows() ) { - global $wgEnotifUseRealName; - $name = ( $wgEnotifUseRealName && $this->realName ) ? $this->realName : $this->name; - $quoted = wfQuotedPrintable( $name ); - if( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) { - $quoted = '"' . $quoted . '"'; + if ( $this->address ) { + if ( $this->name != '' && !wfIsWindows() ) { + global $wgEnotifUseRealName; + $name = ( $wgEnotifUseRealName && $this->realName ) ? $this->realName : $this->name; + $quoted = UserMailer::quotedPrintable( $name ); + if ( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) { + $quoted = '"' . $quoted . '"'; + } + return "$quoted <{$this->address}>"; + } else { + return $this->address; } - return "$quoted <{$this->address}>"; } else { - return $this->address; + return ""; } } @@ -79,21 +83,61 @@ class MailAddress { */ class UserMailer { static $mErrorString; - + /** * Send mail using a PEAR mailer + * + * @param $mailer + * @param $dest + * @param $headers + * @param $body + * + * @return Status */ - protected static function sendWithPear($mailer, $dest, $headers, $body) - { - $mailResult = $mailer->send($dest, $headers, $body); + protected static function sendWithPear( $mailer, $dest, $headers, $body ) { + $mailResult = $mailer->send( $dest, $headers, $body ); # Based on the result return an error string, - if( PEAR::isError( $mailResult ) ) { + if ( PEAR::isError( $mailResult ) ) { wfDebug( "PEAR::Mail failed: " . $mailResult->getMessage() . "\n" ); - return new WikiError( $mailResult->getMessage() ); + return Status::newFatal( 'pear-mail-error', $mailResult->getMessage() ); + } else { + return Status::newGood(); + } + } + + /** + * Creates a single string from an associative array + * + * @param $headers array Associative Array: keys are header field names, + * values are ... values. + * @param $endl String: The end of line character. Defaults to "\n" + * @return String + */ + static function arrayToHeaderString( $headers, $endl = "\n" ) { + $strings = array(); + foreach( $headers as $name => $value ) { + $strings[] = "$name: $value"; + } + return implode( $endl, $strings ); + } + + /** + * Create a value suitable for the MessageId Header + * + * @return String + */ + static function makeMsgId() { + global $wgSMTP, $wgServer; + + $msgid = uniqid( wfWikiID() . ".", true ); /* true required for cygwin */ + if ( is_array($wgSMTP) && isset($wgSMTP['IDHost']) && $wgSMTP['IDHost'] ) { + $domain = $wgSMTP['IDHost']; } else { - return true; + $url = wfParseUrl($wgServer); + $domain = $url['host']; } + return "<$msgid@$domain>"; } /** @@ -107,77 +151,131 @@ class UserMailer { * @param $subject String: email's subject. * @param $body String: email's text. * @param $replyto MailAddress: optional reply-to email (default: null). - * @param $contentType String: optional custom Content-Type - * @return mixed True on success, a WikiError object on failure. + * @param $contentType String: optional custom Content-Type (default: text/plain; charset=UTF-8) + * @return Status object */ - static function send( $to, $from, $subject, $body, $replyto=null, $contentType=null ) { - global $wgSMTP, $wgOutputEncoding, $wgEnotifImpersonal; - global $wgEnotifMaxRecips; - - if ( is_array( $to ) ) { - // This wouldn't be necessary if implode() worked on arrays of - // objects using __toString(). http://bugs.php.net/bug.php?id=36612 - foreach( $to as $t ) { - $emails .= $t->toString() . ","; + public static function send( $to, $from, $subject, $body, $replyto = null, $contentType = 'text/plain; charset=UTF-8' ) { + global $wgSMTP, $wgEnotifMaxRecips, $wgAdditionalMailParams; + + if ( !is_array( $to ) ) { + $to = array( $to ); + } + + wfDebug( __METHOD__ . ': sending mail to ' . implode( ', ', $to ) . "\n" ); + + # Make sure we have at least one address + $has_address = false; + foreach ( $to as $u ) { + if ( $u->address ) { + $has_address = true; + break; } - $emails = rtrim( $emails, ',' ); - wfDebug( __METHOD__.': sending mail to ' . $emails . "\n" ); - } else { - wfDebug( __METHOD__.': sending mail to ' . implode( ',', array( $to->toString() ) ) . "\n" ); + } + if ( !$has_address ) { + return Status::newFatal( 'user-mail-no-addy' ); } - if (is_array( $wgSMTP )) { - require_once( 'Mail.php' ); + # Forge email headers + # ------------------- + # + # WARNING + # + # DO NOT add To: or Subject: headers at this step. They need to be + # handled differently depending upon the mailer we are going to use. + # + # To: + # PHP mail() first argument is the mail receiver. The argument is + # used as a recipient destination and as a To header. + # + # PEAR mailer has a recipient argument which is only used to + # send the mail. If no To header is given, PEAR will set it to + # to 'undisclosed-recipients:'. + # + # NOTE: To: is for presentation, the actual recipient is specified + # by the mailer using the Rcpt-To: header. + # + # Subject: + # PHP mail() second argument to pass the subject, passing a Subject + # as an additional header will result in a duplicate header. + # + # PEAR mailer should be passed a Subject header. + # + # -- hashar 20120218 + + $headers['From'] = $from->toString(); + $headers['Return-Path'] = $from->address; + + if ( $replyto ) { + $headers['Reply-To'] = $replyto->toString(); + } + + $headers['Date'] = date( 'r' ); + $headers['MIME-Version'] = '1.0'; + $headers['Content-type'] = ( is_null( $contentType ) ? + 'text/plain; charset=UTF-8' : $contentType ); + $headers['Content-transfer-encoding'] = '8bit'; - $msgid = str_replace(" ", "_", microtime()); - if (function_exists('posix_getpid')) - $msgid .= '.' . posix_getpid(); + $headers['Message-ID'] = self::makeMsgId(); + $headers['X-Mailer'] = 'MediaWiki mailer'; - if (is_array($to)) { - $dest = array(); - foreach ($to as $u) - $dest[] = $u->address; - } else - $dest = $to->address; + $ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) ); + if ( $ret === false ) { + return Status::newGood(); + } elseif ( $ret !== true ) { + return Status::newFatal( 'php-mail-error', $ret ); + } - $headers['From'] = $from->toString(); + if ( is_array( $wgSMTP ) ) { + # + # PEAR MAILER + # - if ($wgEnotifImpersonal) { - $headers['To'] = 'undisclosed-recipients:;'; + if ( function_exists( 'stream_resolve_include_path' ) ) { + $found = stream_resolve_include_path( 'Mail.php' ); + } else { + $found = Fallback::stream_resolve_include_path( 'Mail.php' ); } - else { - $headers['To'] = implode( ", ", (array )$dest ); + if ( !$found ) { + throw new MWException( 'PEAR mail package is not installed' ); } + require_once( 'Mail.php' ); - if ( $replyto ) { - $headers['Reply-To'] = $replyto->toString(); - } - $headers['Subject'] = wfQuotedPrintable( $subject ); - $headers['Date'] = date( 'r' ); - $headers['MIME-Version'] = '1.0'; - $headers['Content-type'] = (is_null($contentType) ? - 'text/plain; charset='.$wgOutputEncoding : $contentType); - $headers['Content-transfer-encoding'] = '8bit'; - $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME - $headers['X-Mailer'] = 'MediaWiki mailer'; + wfSuppressWarnings(); // Create the mail object using the Mail::factory method - $mail_object =& Mail::factory('smtp', $wgSMTP); - if( PEAR::isError( $mail_object ) ) { + $mail_object =& Mail::factory( 'smtp', $wgSMTP ); + if ( PEAR::isError( $mail_object ) ) { wfDebug( "PEAR::Mail factory failed: " . $mail_object->getMessage() . "\n" ); - return new WikiError( $mail_object->getMessage() ); + wfRestoreWarnings(); + return Status::newFatal( 'pear-mail-error', $mail_object->getMessage() ); + } + + wfDebug( "Sending mail via PEAR::Mail\n" ); + + $headers['Subject'] = self::quotedPrintable( $subject ); + + # When sending only to one recipient, shows it its email using To: + if ( count( $to ) == 1 ) { + $headers['To'] = $to[0]->toString(); } - wfDebug( "Sending mail via PEAR::Mail to $dest\n" ); - $chunks = array_chunk( (array)$dest, $wgEnotifMaxRecips ); - foreach ($chunks as $chunk) { - $e = self::sendWithPear($mail_object, $chunk, $headers, $body); - if( WikiError::isError( $e ) ) - return $e; + # Split jobs since SMTP servers tends to limit the maximum + # number of possible recipients. + $chunks = array_chunk( $to, $wgEnotifMaxRecips ); + foreach ( $chunks as $chunk ) { + $status = self::sendWithPear( $mail_object, $chunk, $headers, $body ); + # FIXME : some chunks might be sent while others are not! + if ( !$status->isOK() ) { + wfRestoreWarnings(); + return $status; + } } + wfRestoreWarnings(); + return Status::newGood(); } 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) + # + # PHP mail() + # # Line endings need to be different on Unix and Windows due to # the bug described at http://trac.wordpress.org/ticket/2603 @@ -187,31 +285,26 @@ class UserMailer { } else { $endl = "\n"; } - $ctype = (is_null($contentType) ? - 'text/plain; charset='.$wgOutputEncoding : $contentType); - $headers = - "MIME-Version: 1.0$endl" . - "Content-type: $ctype$endl" . - "Content-Transfer-Encoding: 8bit$endl" . - "X-Mailer: MediaWiki mailer$endl". - 'From: ' . $from->toString(); - if ($replyto) { - $headers .= "{$endl}Reply-To: " . $replyto->toString(); + + if( count($to) > 1 ) { + $headers['To'] = 'undisclosed-recipients:;'; } + $headers = self::arrayToHeaderString( $headers, $endl ); wfDebug( "Sending mail via internal mail() function\n" ); - + self::$mErrorString = ''; $html_errors = ini_get( 'html_errors' ); ini_set( 'html_errors', '0' ); - set_error_handler( array( 'UserMailer', 'errorHandler' ) ); + set_error_handler( 'UserMailer::errorHandler' ); - if (is_array($to)) { - foreach ($to as $recip) { - $sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers ); + $safeMode = wfIniGetBool( 'safe_mode' ); + foreach ( $to as $recip ) { + if ( $safeMode ) { + $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers ); + } else { + $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); } - } else { - $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers ); } restore_error_handler(); @@ -219,13 +312,13 @@ class UserMailer { if ( self::$mErrorString ) { wfDebug( "Error sending mail: " . self::$mErrorString . "\n" ); - return new WikiError( self::$mErrorString ); - } elseif (! $sent ) { - //mail function only tells if there's an error - wfDebug( "Error sending mail\n" ); - return new WikiError( 'mail() failed' ); + return Status::newFatal( 'php-mail-error', self::$mErrorString ); + } elseif ( ! $sent ) { + // mail function only tells if there's an error + wfDebug( "Unknown error sending mail\n" ); + return Status::newFatal( 'php-mail-error-unknown' ); } else { - return true; + return Status::newGood(); } } } @@ -242,11 +335,42 @@ class UserMailer { /** * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name + * @param $phrase string + * @return string */ - static function rfc822Phrase( $phrase ) { + public static function rfc822Phrase( $phrase ) { $phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) ); return '"' . $phrase . '"'; } + + /** + * Converts a string into quoted-printable format + * @since 1.17 + * @return string + */ + public static function quotedPrintable( $string, $charset = '' ) { + # Probably incomplete; see RFC 2045 + if( empty( $charset ) ) { + $charset = 'UTF-8'; + } + $charset = strtoupper( $charset ); + $charset = str_replace( 'ISO-8859', 'ISO8859', $charset ); // ? + + $illegal = '\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff='; + $replace = $illegal . '\t ?_'; + if( !preg_match( "/[$illegal]/", $string ) ) { + return $string; + } + $out = "=?$charset?Q?"; + $out .= preg_replace_callback( "/([$replace])/", + array( __CLASS__, 'quotedPrintableCallback' ), $string ); + $out .= '?='; + return $out; + } + + protected static function quotedPrintableCallback( $matches ) { + return sprintf( "=%02X", ord( $matches[1] ) ); + } } /** @@ -270,10 +394,20 @@ class UserMailer { * */ class EmailNotification { - protected $to, $subject, $body, $replyto, $from; - protected $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor; + protected $subject, $body, $replyto, $from; + protected $timestamp, $summary, $minorEdit, $oldid, $composed_common; protected $mailTargets = array(); + /** + * @var Title + */ + protected $title; + + /** + * @var User + */ + protected $editor; + /** * Send emails corresponding to the user $editor editing the page $title. * Also updates wl_notificationtimestamp. @@ -287,15 +421,17 @@ class EmailNotification { * @param $minorEdit * @param $oldid (default: false) */ - function notifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid = false) { - global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker; + public function notifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid = false ) { + global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker, $wgEnotifMinorEdits, + $wgUsersNotifiedOnAllChanges, $wgEnotifUserTalk; - if ($title->getNamespace() < 0) + if ( $title->getNamespace() < 0 ) { return; + } // Build a list of users to notfiy $watchers = array(); - if ($wgEnotifWatchlist || $wgShowUpdatedMarker) { + if ( $wgEnotifWatchlist || $wgShowUpdatedMarker ) { $dbw = wfGetDB( DB_MASTER ); $res = $dbw->select( array( 'watchlist' ), array( 'wl_user' ), @@ -309,10 +445,10 @@ class EmailNotification { foreach ( $res as $row ) { $watchers[] = intval( $row->wl_user ); } - if ($watchers) { + if ( $watchers ) { // Update wl_notificationtimestamp for all watching users except // the editor - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->update( 'watchlist', array( /* SET */ 'wl_notificationtimestamp' => $dbw->timestamp( $timestamp ) @@ -322,28 +458,46 @@ class EmailNotification { 'wl_user' => $watchers ), __METHOD__ ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); + } + } + + $sendEmail = true; + // If nobody is watching the page, and there are no users notified on all changes + // don't bother creating a job/trying to send emails + // $watchers deals with $wgEnotifWatchlist + if ( !count( $watchers ) && !count( $wgUsersNotifiedOnAllChanges ) ) { + $sendEmail = false; + // Only send notification for non minor edits, unless $wgEnotifMinorEdits + if ( !$minorEdit || ( $wgEnotifMinorEdits && !$editor->isAllowed( 'nominornewtalk' ) ) ) { + $isUserTalkPage = ( $title->getNamespace() == NS_USER_TALK ); + if ( $wgEnotifUserTalk && $isUserTalkPage && $this->canSendUserTalkEmail( $editor, $title, $minorEdit ) ) { + $sendEmail = true; + } } } - if ($wgEnotifUseJobQ) { + if ( !$sendEmail ) { + return; + } + if ( $wgEnotifUseJobQ ) { $params = array( - "editor" => $editor->getName(), - "editorID" => $editor->getID(), - "timestamp" => $timestamp, - "summary" => $summary, - "minorEdit" => $minorEdit, - "oldid" => $oldid, - "watchers" => $watchers); + 'editor' => $editor->getName(), + 'editorID' => $editor->getID(), + 'timestamp' => $timestamp, + 'summary' => $summary, + 'minorEdit' => $minorEdit, + 'oldid' => $oldid, + 'watchers' => $watchers + ); $job = new EnotifNotifyJob( $title, $params ); $job->insert(); } else { $this->actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers ); } - } - /* + /** * Immediate version of notifyOnPageChange(). * * Send emails corresponding to the user $editor editing the page $title. @@ -357,7 +511,7 @@ class EmailNotification { * @param $oldid int Revision ID * @param $watchers array of user IDs */ - function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers) { + public function actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers ) { # we use $wgPasswordSender as sender's address global $wgEnotifWatchlist; global $wgEnotifMinorEdits, $wgEnotifUserTalk; @@ -368,7 +522,7 @@ class EmailNotification { # 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); + $isUserTalkPage = ( $title->getNamespace() == NS_USER_TALK ); $this->title = $title; $this->timestamp = $timestamp; @@ -380,24 +534,12 @@ class EmailNotification { $userTalkId = false; - if ( !$minorEdit || ($wgEnotifMinorEdits && !$editor->isAllowed('nominornewtalk') ) ) { - if ( $wgEnotifUserTalk && $isUserTalkPage ) { + if ( !$minorEdit || ( $wgEnotifMinorEdits && !$editor->isAllowed( 'nominornewtalk' ) ) ) { + + if ( $wgEnotifUserTalk && $isUserTalkPage && $this->canSendUserTalkEmail( $editor, $title, $minorEdit ) ) { $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' ) ) { - if( $targetUser->isEmailConfirmed() ) { - wfDebug( __METHOD__.": sending talk page update notification\n" ); - $this->compose( $targetUser ); - $userTalkId = $targetUser->getId(); - } else { - wfDebug( __METHOD__.": talk page owner doesn't have validated email\n" ); - } - } else { - wfDebug( __METHOD__.": talk page owner doesn't want notifications\n" ); - } + $this->compose( $targetUser ); + $userTalkId = $targetUser->getId(); } if ( $wgEnotifWatchlist ) { @@ -405,7 +547,7 @@ class EmailNotification { $userArray = UserArray::newFromIDs( $watchers ); foreach ( $userArray as $watchingUser ) { if ( $watchingUser->getOption( 'enotifwatchlistpages' ) && - ( !$minorEdit || $watchingUser->getOption('enotifminoredits') ) && + ( !$minorEdit || $watchingUser->getOption( 'enotifminoredits' ) ) && $watchingUser->isEmailConfirmed() && $watchingUser->getID() != $userTalkId ) { @@ -417,6 +559,10 @@ class EmailNotification { global $wgUsersNotifiedOnAllChanges; foreach ( $wgUsersNotifiedOnAllChanges as $name ) { + if ( $editor->getName() == $name ) { + // No point notifying the user that actually made the change! + continue; + } $user = User::newFromName( $name ); $this->compose( $user ); } @@ -426,31 +572,65 @@ class EmailNotification { } /** - * @private + * @param $editor User + * @param $title Title bool + * @param $minorEdit + * @return bool */ - function composeCommonMailtext() { - global $wgPasswordSender, $wgNoReplyAddress; + private function canSendUserTalkEmail( $editor, $title, $minorEdit ) { + global $wgEnotifUserTalk; + $isUserTalkPage = ( $title->getNamespace() == NS_USER_TALK ); + + 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' ) && + ( !$minorEdit || $targetUser->getOption( 'enotifminoredits' ) ) ) + { + if ( $targetUser->isEmailConfirmed() ) { + wfDebug( __METHOD__ . ": sending talk page update notification\n" ); + return true; + } else { + wfDebug( __METHOD__ . ": talk page owner doesn't have validated email\n" ); + } + } else { + wfDebug( __METHOD__ . ": talk page owner doesn't want notifications\n" ); + } + } + return false; + } + + /** + * Generate the generic "this page has been changed" e-mail text. + */ + private function composeCommonMailtext() { + global $wgPasswordSender, $wgPasswordSenderName, $wgNoReplyAddress; global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress; global $wgEnotifImpersonal, $wgEnotifUseRealName; $this->composed_common = true; - $summary = ($this->summary == '') ? ' - ' : $this->summary; - $medit = ($this->minorEdit) ? wfMsgForContent( '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(); - - if( $this->oldid ) { - $difflink = $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid ); - $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink ); + $keys = array(); + $postTransformKeys = array(); + + if ( $this->oldid ) { + // Always show a link to the diff which triggered the mail. See bug 32210. + $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', + $this->title->getCanonicalUrl( 'diff=next&oldid=' . $this->oldid ) ); + if ( !$wgEnotifImpersonal ) { + // For personal mail, also show a link to the diff of all changes + // since last visited. + $keys['$NEWPAGE'] .= " \n" . wfMsgForContent( 'enotif_lastvisited', + $this->title->getCanonicalUrl( 'diff=0&oldid=' . $this->oldid ) ); + } $keys['$OLDID'] = $this->oldid; $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' ); } else { @@ -460,68 +640,57 @@ class EmailNotification { $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'created' ); } - 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=next")); + $keys['$PAGETITLE'] = $this->title->getPrefixedText(); + $keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl(); + $keys['$PAGEMINOREDIT'] = $this->minorEdit ? wfMsgForContent( 'minoredit' ) : ''; + $keys['$UNWATCHURL'] = $this->title->getCanonicalUrl( 'action=unwatch' ); - $body = strtr( $body, $keys ); - $pagetitle = $this->title->getPrefixedText(); - $keys['$PAGETITLE'] = $pagetitle; - $keys['$PAGETITLE_URL'] = $this->title->getFullUrl(); + if ( $this->editor->isAnon() ) { + # real anon (user:xxx.xxx.xxx.xxx) + $keys['$PAGEEDITOR'] = wfMsgForContent( 'enotif_anon_editor', $this->editor->getName() ); + $keys['$PAGEEDITOR_EMAIL'] = wfMsgForContent( 'noemailtitle' ); + } else { + $keys['$PAGEEDITOR'] = $wgEnotifUseRealName ? $this->editor->getRealName() : $this->editor->getName(); + $emailPage = SpecialPage::getSafeTitleFor( 'Emailuser', $this->editor->getName() ); + $keys['$PAGEEDITOR_EMAIL'] = $emailPage->getCanonicalUrl(); + } + + $keys['$PAGEEDITOR_WIKI'] = $this->editor->getUserPage()->getCanonicalUrl(); + + # Replace this after transforming the message, bug 35019 + $postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary; - $keys['$PAGEMINOREDIT'] = $medit; - $keys['$PAGESUMMARY'] = $summary; - $keys['$UNWATCHURL'] = $this->title->getFullUrl( 'action=unwatch' ); + # Now build message's subject and body + $subject = wfMsgExt( 'enotif_subject', 'content' ); $subject = strtr( $subject, $keys ); + $subject = MessageCache::singleton()->transform( $subject, false, null, $this->title ); + $this->subject = strtr( $subject, $postTransformKeys ); + + $body = wfMsgExt( 'enotif_body', 'content' ); + $body = strtr( $body, $keys ); + $body = MessageCache::singleton()->transform( $body, false, null, $this->title ); + $this->body = wordwrap( strtr( $body, $postTransformKeys ), 72 ); # 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. - $editor = $this->editor; - $name = $wgEnotifUseRealName ? $editor->getRealName() : $editor->getName(); - $adminAddress = new MailAddress( $wgPasswordSender, 'WikiAdmin' ); - $editorAddress = new MailAddress( $editor ); - if( $wgEnotifRevealEditorAddress - && ( $editor->getEmail() != '' ) - && $editor->getOption( 'enotifrevealaddr' ) ) { - if( $wgEnotifFromEditor ) { - $from = $editorAddress; + $adminAddress = new MailAddress( $wgPasswordSender, $wgPasswordSenderName ); + if ( $wgEnotifRevealEditorAddress + && ( $this->editor->getEmail() != '' ) + && $this->editor->getOption( 'enotifrevealaddr' ) ) + { + $editorAddress = new MailAddress( $this->editor ); + if ( $wgEnotifFromEditor ) { + $this->from = $editorAddress; } else { - $from = $adminAddress; - $replyto = $editorAddress; + $this->from = $adminAddress; + $this->replyto = $editorAddress; } } else { - $from = $adminAddress; - $replyto = new MailAddress( $wgNoReplyAddress ); + $this->from = $adminAddress; + $this->replyto = new MailAddress( $wgNoReplyAddress ); } - - 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; } /** @@ -529,6 +698,7 @@ class EmailNotification { * depending on settings. * * Call sendMails() to send any mails that were queued. + * @param $user User */ function compose( $user ) { global $wgEnotifImpersonal; @@ -568,55 +738,43 @@ class EmailNotification { // Note: The to parameter cannot be an address in the form of "Something ". // The mail command will not parse this properly while talking with the MTA. $to = new MailAddress( $watchingUser ); - $name = $wgEnotifUseRealName ? $watchingUser->getRealName() : $watchingUser->getName(); - $body = str_replace( '$WATCHINGUSERNAME', $name , $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( - array( '$PAGEEDITDATEANDTIME', + array( '$WATCHINGUSERNAME', '$PAGEEDITDATE', '$PAGEEDITTIME' ), - array( $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ), - $wgContLang->date( $this->timestamp, true, false, $timecorrection ), - $wgContLang->time( $this->timestamp, true, false, $timecorrection ) ), - $body); + array( $wgEnotifUseRealName ? $watchingUser->getRealName() : $watchingUser->getName(), + $wgContLang->userDate( $this->timestamp, $watchingUser ), + $wgContLang->userTime( $this->timestamp, $watchingUser ) ), + $this->body ); - return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto); + 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. + * @return Status */ function sendImpersonal( $addresses ) { global $wgContLang; - if (empty($addresses)) + if ( empty( $addresses ) ) return; $body = str_replace( - array( '$WATCHINGUSERNAME', - '$PAGEEDITDATE'), - array( wfMsgForContent('enotif_impersonal_salutation'), - $wgContLang->timeanddate($this->timestamp, true, false, false)), - $this->body); - - return UserMailer::send($addresses, $this->from, $this->subject, $body, $this->replyto); + array( '$WATCHINGUSERNAME', + '$PAGEEDITDATE', + '$PAGEEDITTIME' ), + array( wfMsgForContent( 'enotif_impersonal_salutation' ), + $wgContLang->date( $this->timestamp, false, false ), + $wgContLang->time( $this->timestamp, false, false ) ), + $this->body ); + + 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 ); -}