X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=ba67efceb4757bde6c506aa8e1143bf897392212;hb=a2a9b469908464da9f2a42dcf48412f62215cd6b;hp=649fa20a7a7bfbee1b10912d62baff22679bce16;hpb=9a860bef79a0b554345b02794045e3611d05ec08;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/UserMailer.php b/includes/UserMailer.php index 649fa20a7a..ba67efceb4 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -154,39 +154,36 @@ class UserMailer { * @return Status object */ public static function send( $to, $from, $subject, $body, $replyto = null, $contentType = 'text/plain; charset=UTF-8' ) { - global $wgSMTP, $wgEnotifImpersonal; - global $wgEnotifMaxRecips, $wgAdditionalMailParams; + global $wgSMTP, $wgEnotifMaxRecips, $wgAdditionalMailParams; - $emails = ''; - wfDebug( __METHOD__ . ': sending mail to ' . implode( ',', array( $to->toString() ) ) . "\n" ); + if ( !is_array( $to ) ) { + $to = array( $to ); + } - $headers['From'] = $from->toString(); - $headers['Return-Path'] = $from->toString(); + wfDebug( __METHOD__ . ': sending mail to ' . implode( ', ', $to ) . "\n" ); $dest = array(); - if ( is_array( $to ) ) { - foreach ( $to as $u ) { - if ( $u->address ) { - $dest[] = $u->address; - } + foreach ( $to as $u ) { + if ( $u->address ) { + $dest[] = $u->address; } - } else if( $to->address ) { - $dest[] = $to->address; } if ( count( $dest ) == 0 ) { return Status::newFatal( 'user-mail-no-addy' ); } - if ( $wgEnotifImpersonal ) { + $headers['From'] = $from->toString(); + $headers['Return-Path'] = $from->address; + if ( count( $to ) == 1 ) { + $headers['To'] = $to[0]->toString(); + } else { $headers['To'] = 'undisclosed-recipients:;'; } - else { - $headers['To'] = implode( ", ", $dest ); - } if ( $replyto ) { $headers['Reply-To'] = $replyto->toString(); } + $headers['Subject'] = self::quotedPrintable( $subject ); $headers['Date'] = date( 'r' ); $headers['MIME-Version'] = '1.0'; @@ -196,12 +193,11 @@ class UserMailer { $headers['Message-ID'] = self::makeMsgId(); $headers['X-Mailer'] = 'MediaWiki mailer'; - $headers['From'] = $from->toString(); $ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) ); if ( $ret === false ) { return Status::newGood(); - } else if ( $ret !== true ) { + } elseif ( $ret !== true ) { return Status::newFatal( 'php-mail-error', $ret ); } @@ -351,10 +347,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. @@ -506,6 +512,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 ); } @@ -544,7 +554,7 @@ class EmailNotification { wfDebug( __METHOD__ . ": talk page owner doesn't want notifications\n" ); } } - return false; + return false; } /** @@ -557,22 +567,21 @@ class EmailNotification { $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(); + $keys = array(); if ( $this->oldid ) { - $difflink = $this->title->getCanonicalUrl( 'diff=0&oldid=' . $this->oldid ); - $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink ); + if ( $wgEnotifImpersonal ) { + // For impersonal mail, show a diff link to the last revision. + $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', + $this->title->getCanonicalUrl( 'diff=next&oldid=' . $this->oldid ) ); + } else { + $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', + $this->title->getCanonicalUrl( 'diff=0&oldid=' . $this->oldid ) ); + } $keys['$OLDID'] = $this->oldid; $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' ); } else { @@ -582,69 +591,54 @@ 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->getCanonicalUrl( "oldid={$this->oldid}&diff=next" ) ); + $keys['$PAGETITLE'] = $this->title->getPrefixedText(); + $keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl(); + $keys['$PAGEMINOREDIT'] = $this->minorEdit ? wfMsgForContent( 'minoredit' ) : ''; + $keys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary; + $keys['$UNWATCHURL'] = $this->title->getCanonicalUrl( 'action=unwatch' ); + + 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(); } - $body = strtr( $body, $keys ); - $pagetitle = $this->title->getPrefixedText(); - $keys['$PAGETITLE'] = $pagetitle; - $keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl(); + $keys['$PAGEEDITOR_WIKI'] = $this->editor->getUserPage()->getCanonicalUrl(); - $keys['$PAGEMINOREDIT'] = $medit; - $keys['$PAGESUMMARY'] = $summary; - $keys['$UNWATCHURL'] = $this->title->getCanonicalUrl( 'action=unwatch' ); + # Now build message's subject and body + $subject = wfMsgExt( 'enotif_subject', 'content' ); $subject = strtr( $subject, $keys ); + $this->subject = MessageCache::singleton()->transform( $subject, false, null, $this->title ); + + $body = wfMsgExt( 'enotif_body', 'content' ); + $body = strtr( $body, $keys ); + $body = MessageCache::singleton()->transform( $body, false, null, $this->title ); + $this->body = wordwrap( $body, 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, $wgPasswordSenderName ); - $editorAddress = new MailAddress( $editor ); if ( $wgEnotifRevealEditorAddress - && ( $editor->getEmail() != '' ) - && $editor->getOption( 'enotifrevealaddr' ) ) { + && ( $this->editor->getEmail() != '' ) + && $this->editor->getOption( 'enotifrevealaddr' ) ) + { + $editorAddress = new MailAddress( $this->editor ); if ( $wgEnotifFromEditor ) { - $from = $editorAddress; + $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->isAnon() ) { - # 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->getCanonicalUrl(); - } - $userPage = $editor->getUserPage(); - $keys['$PAGEEDITOR_WIKI'] = $userPage->getCanonicalUrl(); - $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; } /** @@ -652,6 +646,7 @@ class EmailNotification { * depending on settings. * * Call sendMails() to send any mails that were queued. + * @param $user User */ function compose( $user ) { global $wgEnotifImpersonal; @@ -691,22 +686,18 @@ 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 ); } @@ -726,8 +717,8 @@ class EmailNotification { '$PAGEEDITDATE', '$PAGEEDITTIME' ), array( wfMsgForContent( 'enotif_impersonal_salutation' ), - $wgContLang->date( $this->timestamp, true, false, false ), - $wgContLang->time( $this->timestamp, true, false, false ) ), + $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 );