No MaxSem, you can't revert r65715 on r65716. Use a class variable instead of a globa...

[lhc/web/wiklou.git] / includes / UserMailer.php

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 55ab703..5ae6c51 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -75,6 +75,8 @@ class MailAddress {
  * Collection of static functions for sending mail
  */
 class UserMailer {
+       static $mErrorString;
+       
        /**
         * Send mail using a PEAR mailer
         */
@@ -106,7 +108,7 @@ class UserMailer {
         * @return mixed True on success, a WikiError object on failure.
         */
        static function send( $to, $from, $subject, $body, $replyto=null, $contentType=null ) {
-               global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
+               global $wgSMTP, $wgOutputEncoding, $wgEnotifImpersonal;
                global $wgEnotifMaxRecips;
 
                if ( is_array( $to ) ) {
@@ -188,11 +190,12 @@ class UserMailer {
                                $headers .= "{$endl}Reply-To: " . $replyto->toString();
                        }
 
-                       $wgErrorString = '';
+                       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' ) );
-                       wfDebug( "Sending mail via internal mail() function\n" );
 
                        if (function_exists('mail')) {
                                if (is_array($to)) {
@@ -203,19 +206,19 @@ class UserMailer {
                                        $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
                                }
                        } else {
-                               $wgErrorString = 'PHP is not configured to send mail';
+                               self::$mErrorString = '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 new WikiError( $wgErrorString );
-                       } elseif (! $sent) {
+                       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( 'mailer error' );
+                               return new WikiError( 'mail() failed' );
                        } else {
                                return true;
                        }
@@ -223,14 +226,13 @@ class UserMailer {
        }
 
        /**
-        * Get the mail error message in global $wgErrorString
+        * Set the mail error message in self::$mErrorString
         *
         * @param $code Integer: error number
         * @param $string String: error message
         */
        static function errorHandler( $code, $string ) {
-               global $wgErrorString;
-               $wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
+               self::$mErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
        }
 
        /**
@@ -263,9 +265,9 @@ class UserMailer {
  *
  */
 class EmailNotification {
-       private $to, $subject, $body, $replyto, $from;
-       private $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
-       private $mailTargets = array();
+       protected $to, $subject, $body, $replyto, $from;
+       protected $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
+       protected $mailTargets = array();
 
        /**
         * Send emails corresponding to the user $editor editing the page $title.
@@ -310,6 +312,8 @@ class EmailNotification {
                                        array( /* SET */
                                                'wl_notificationtimestamp' => $dbw->timestamp( $timestamp )
                                        ), array( /* WHERE */
+                                               'wl_title' => $title->getDBkey(),
+                                               'wl_namespace' => $title->getNamespace(),
                                                'wl_user' => $watchers
                                        ), __METHOD__
                                );
@@ -469,6 +473,7 @@ class EmailNotification {
 
                $keys['$PAGEMINOREDIT']      = $medit;
                $keys['$PAGESUMMARY']        = $summary;
+               $keys['$UNWATCHURL']         = $this->title->getFullUrl( 'action=unwatch' );
 
                $subject = strtr( $subject, $keys );
 
@@ -557,7 +562,7 @@ class EmailNotification {
         * @private
         */
        function sendPersonalised( $watchingUser ) {
-               global $wgLang, $wgEnotifUseRealName;
+               global $wgContLang, $wgEnotifUseRealName;
                // 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.
@@ -570,8 +575,13 @@ class EmailNotification {
                # $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 = str_replace(
+                       array(  '$PAGEEDITDATEANDTIME',
+                               '$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);
 
                return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto);
@@ -582,7 +592,7 @@ class EmailNotification {
         * mailing.  Takes an array of MailAddress objects.
         */
        function sendImpersonal( $addresses ) {
-               global $wgLang;
+               global $wgContLang;
 
                if (empty($addresses))
                        return;
@@ -591,7 +601,7 @@ class EmailNotification {
                                array(  '$WATCHINGUSERNAME',
                                        '$PAGEEDITDATE'),
                                array(  wfMsgForContent('enotif_impersonal_salutation'),
-                                       $wgLang->timeanddate($this->timestamp, true, false, false)),
+                                       $wgContLang->timeanddate($this->timestamp, true, false, false)),
                                $this->body);
 
                return UserMailer::send($addresses, $this->from, $this->subject, $body, $this->replyto);