(part of bug 6100) Set the directionality based on user language instead of content...

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

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index fd91d5b..cabccac 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -31,7 +31,7 @@
  */
 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
         */
@@ -82,6 +82,13 @@ class UserMailer {
 
        /**
         * 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 );
@@ -138,15 +145,18 @@ class UserMailer {
                        require_once( 'Mail.php' );
 
                        $msgid = str_replace( " ", "_", microtime() );
-                       if ( function_exists( 'posix_getpid' ) )
+                       if ( function_exists( 'posix_getpid' ) ) {
                                $msgid .= '.' . posix_getpid();
+                       }
 
                        if ( is_array( $to ) ) {
                                $dest = array();
-                               foreach ( $to as $u )
+                               foreach ( $to as $u ) {
                                        $dest[] = $u->address;
-                       } else
+                               }
+                       } else {
                                $dest = $to->address;
+                       }
 
                        $headers['From'] = $from->toString();
 
@@ -219,7 +229,7 @@ class UserMailer {
                        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 ) ) {
                                $to = array( $to );
@@ -256,6 +266,8 @@ class UserMailer {
 
        /**
         * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
+        * @param $phrase string
+        * @return string
         */
        public static function rfc822Phrase( $phrase ) {
                $phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) );
@@ -332,8 +344,9 @@ class EmailNotification {
        public function notifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid = false ) {
                global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker;
 
-               if ( $title->getNamespace() < 0 )
+               if ( $title->getNamespace() < 0 ) {
                        return;
+               }
 
                // Build a list of users to notfiy
                $watchers = array();
@@ -385,7 +398,7 @@ class EmailNotification {
 
        }
 
-       /*
+       /**
         * Immediate version of notifyOnPageChange().
         *
         * Send emails corresponding to the user $editor editing the page $title.
@@ -429,7 +442,9 @@ class EmailNotification {
                                        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' ) ) {
+                               } elseif ( $targetUser->getOption( 'enotifusertalkpages' ) &&
+                                       ( !$minorEdit || $targetUser->getOption( 'enotifminoredits' ) ) )
+                               {
                                        if ( $targetUser->isEmailConfirmed() ) {
                                                wfDebug( __METHOD__ . ": sending talk page update notification\n" );
                                                $this->compose( $targetUser );
@@ -503,7 +518,7 @@ class EmailNotification {
                }
 
                if ( $wgEnotifImpersonal && $this->oldid ) {
-                       /*
+                       /**
                         * For impersonal mail, show a diff link to the last
                         * revision.
                         */
@@ -543,7 +558,7 @@ class EmailNotification {
                        $replyto = new MailAddress( $wgNoReplyAddress );
                }
 
-               if ( $editor->isIP( $name ) ) {
+               if ( $editor->isAnon() ) {
                        # real anon (user:xxx.xxx.xxx.xxx)
                        $utext = wfMsgForContent( 'enotif_anon_editor', $name );
                        $subject = str_replace( '$PAGEEDITOR', $utext, $subject );
@@ -643,9 +658,11 @@ class EmailNotification {
 
                $body = str_replace(
                                array( '$WATCHINGUSERNAME',
-                                       '$PAGEEDITDATE' ),
+                                       '$PAGEEDITDATE',
+                                       '$PAGEEDITTIME' ),
                                array( wfMsgForContent( 'enotif_impersonal_salutation' ),
-                                       $wgContLang->timeanddate( $this->timestamp, true, false, false ) ),
+                                       $wgContLang->date( $this->timestamp, true, false, false ),
+                                       $wgContLang->time( $this->timestamp, true, false, false ) ),
                                $this->body );
 
                return UserMailer::send( $addresses, $this->from, $this->subject, $body, $this->replyto );