auf Version 1.11 aktualisiert; Login-Bug behoben

1 files changed, 152 insertions, 43 deletions

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 9f5f178c..835dd310 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -72,6 +72,22 @@ class MailAddress {
 	}
 }
 
+function send_mail($mailer, $dest, $headers, $body)
+{
+	$mailResult =& $mailer->send($dest, $headers, $body);
+
+	# 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.';
+	}
+}
+
 /**
  * This function will perform a direct (authenticated) login to
  * a SMTP Server to use for mail relaying if 'wgSMTP' specifies an
@@ -85,16 +101,30 @@ class MailAddress {
  * @param $replyto String: optional reply-to email (default: null).
  */
 function userMailer( $to, $from, $subject, $body, $replyto=null ) {
-	global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString;
+	global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
+	global $wgEnotifMaxRecips;
 
 	if (is_array( $wgSMTP )) {
 		require_once( 'Mail.php' );
 
-		$timestamp = time();
-		$dest = $to->address;
+		$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();
-		$headers['To'] = $to->toString();
+
+		if ($wgEnotifImpersonal)
+			$headers['To'] = 'undisclosed-recipients:;';
+		else
+			$headers['To'] = $to->toString();
+
 		if ( $replyto ) {
 			$headers['Reply-To'] = $replyto->toString();
 		}
@@ -103,7 +133,7 @@ function userMailer( $to, $from, $subject, $body, $replyto=null ) {
 		$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'] . '>'; // FIXME
+		$headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
 		$headers['X-Mailer'] = 'MediaWiki mailer';
 
 		// Create the mail object using the Mail::factory method
@@ -114,18 +144,16 @@ function userMailer( $to, $from, $subject, $body, $replyto=null ) {
 		}
 
 		wfDebug( "Sending mail via PEAR::Mail to $dest\n" );
-		$mailResult =& $mail_object->send($dest, $headers, $body);
+		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);
 
-		# 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.';
-		}
 	} 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)
@@ -148,21 +176,37 @@ function userMailer( $to, $from, $subject, $body, $replyto=null ) {
 			$headers .= "{$endl}Reply-To: " . $replyto->toString();
 		}
 
-		$dest = $to->toString();
-
 		$wgErrorString = '';
 		set_error_handler( 'mailErrorHandler' );
-		wfDebug( "Sending mail via internal mail() function to $dest\n" );
-		mail( $dest, wfQuotedPrintable( $subject ), $body, $headers );
+		wfDebug( "Sending mail via internal mail() function\n" );
+
+		if (function_exists('mail'))
+			if (is_array($to))
+				foreach ($to as $recip)
+					$sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+			else
+				$sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+		else
+			$wgErrorString = 'PHP is not configured to send mail';
+
+
 		restore_error_handler();
 
 		if ( $wgErrorString ) {
 			wfDebug( "Error sending mail: $wgErrorString\n" );
+			return $wgErrorString;
+		} elseif (! $sent) {
+			//mail function only tells if there's an error
+			wfDebug( "Error sending mail\n" );
+			return 'mailer error';
+		} else {
+			return '';
 		}
-		return $wgErrorString;
 	}
 }
 
+
+
 /**
  * Get the mail error message in global $wgErrorString
  *
@@ -204,6 +248,27 @@ class EmailNotification {
 
 	/**@}}*/
 
+	function notifyOnPageChange($editor, &$title, $timestamp, $summary, $minorEdit, $oldid = false) {
+		global $wgEnotifUseJobQ;
+	
+		if( $title->getNamespace() < 0 )
+			return;
+
+		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);
+		}
+
+	}
+
 	/**
 	 * @todo document
 	 * @param $title Title object
@@ -212,11 +277,12 @@ class EmailNotification {
 	 * @param $minorEdit
 	 * @param $oldid (default: false)
 	 */
-	function notifyOnPageChange(&$title, $timestamp, $summary, $minorEdit, $oldid=false) {
+	function actuallyNotifyOnPageChange($editor, &$title, $timestamp, $summary, $minorEdit, $oldid=false) {
 
 		# we use $wgEmergencyContact as sender's address
-		global $wgUser, $wgEnotifWatchlist;
+		global $wgEnotifWatchlist;
 		global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker;
+		global $wgEnotifImpersonal;
 
 		$fname = 'UserMailer::notifyOnPageChange';
 		wfProfileIn( $fname );
@@ -234,18 +300,20 @@ class EmailNotification {
 		$this->summary = $summary;
 		$this->minorEdit = $minorEdit;
 		$this->oldid = $oldid;
-		$this->composeCommonMailtext();
+		$this->composeCommonMailtext($editor);
+
+		$impersonals = array();
 
 		if ( (!$minorEdit || $wgEnotifMinorEdits) ) {
 			if( $wgEnotifWatchlist ) {
 				// Send updates to watchers other than the current editor
-				$userCondition = 'wl_user <> ' . intval( $wgUser->getId() );
+				$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() == $wgUser->getId() ) {
+				} elseif( $targetUser->getId() == $editor->getId() ) {
 					wfDebug( "$fname: user-talk-only mode; editor is target user\n" );
 					$userCondition = false;
 				} else {
@@ -287,7 +355,10 @@ class EmailNotification {
 						&& ($watchingUser->isEmailConfirmed() ) ) {
 							# ... adjust remaining text and page edit time placeholders
 							# which needs to be personalized for each user
-							$this->composeAndSendPersonalisedMail( $watchingUser );
+							if ($wgEnotifImpersonal)
+								$impersonals[] = $watchingUser;
+							else
+								$this->composeAndSendPersonalisedMail( $watchingUser );
 
 						} # if the watching user has an email address in the preferences
 					}
@@ -298,9 +369,14 @@ class EmailNotification {
 		global $wgUsersNotifedOnAllChanges;
 		foreach ( $wgUsersNotifedOnAllChanges as $name ) {
 			$user = User::newFromName( $name );
-			$this->composeAndSendPersonalisedMail( $user );
+			if ($wgEnotifImpersonal)
+				$impersonals[] = $user;
+			else
+				$this->composeAndSendPersonalisedMail( $user );
 		}
 
+		$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, ...
@@ -311,19 +387,22 @@ class EmailNotification {
 				), array( /* WHERE */
 					'wl_title' => $title->getDBkey(),
 					'wl_namespace' => $title->getNamespace(),
+					'wl_notificationtimestamp IS NULL'
 				), 'UserMailer::NotifyOnChange'
 			);
 			# FIXME what do we do on failure ?
 		}
+
 		wfProfileOut( $fname );
 	} # function NotifyOnChange
 
 	/**
 	 * @private
 	 */
-	function composeCommonMailtext() {
-		global $wgUser, $wgEmergencyContact, $wgNoReplyAddress;
+	function composeCommonMailtext($editor) {
+		global $wgEmergencyContact, $wgNoReplyAddress;
 		global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
+		global $wgEnotifImpersonal;
 
 		$summary = ($this->summary == '') ? ' - ' : $this->summary;
 		$medit   = ($this->minorEdit) ? wfMsg( 'minoredit' ) : '';
@@ -353,6 +432,14 @@ 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=prev"));
+
 		$body = strtr( $body, $keys );
 		$pagetitle = $this->title->getPrefixedText();
 		$keys['$PAGETITLE']          = $pagetitle;
@@ -366,12 +453,12 @@ class EmailNotification {
 		# 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    = $wgUser->getName();
+		$name    = $editor->getName();
 		$adminAddress = new MailAddress( $wgEmergencyContact, 'WikiAdmin' );
-		$editorAddress = new MailAddress( $wgUser );
+		$editorAddress = new MailAddress( $editor );
 		if( $wgEnotifRevealEditorAddress
-		    && ( $wgUser->getEmail() != '' )
-		    && $wgUser->getOption( 'enotifrevealaddr' ) ) {
+		    && ( $editor->getEmail() != '' )
+		    && $editor->getOption( 'enotifrevealaddr' ) ) {
 			if( $wgEnotifFromEditor ) {
 				$from    = $editorAddress;
 			} else {
@@ -383,10 +470,11 @@ class EmailNotification {
 			$replyto = new MailAddress( $wgNoReplyAddress );
 		}
 
-		if( $wgUser->isIP( $name ) ) {
+		if( $editor->isIP( $name ) ) {
 			#real anon (user:xxx.xxx.xxx.xxx)
-			$subject = str_replace('$PAGEEDITOR', 'anonymous user '. $name, $subject);
-			$keys['$PAGEEDITOR']       = 'anonymous user ' . $name;
+			$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);
@@ -394,7 +482,7 @@ class EmailNotification {
 			$emailPage = SpecialPage::getSafeTitleFor( 'Emailuser', $name );
 			$keys['$PAGEEDITOR_EMAIL'] = $emailPage->getFullUrl();
 		}
-		$userPage = $wgUser->getUserPage();
+		$userPage = $editor->getUserPage();
 		$keys['$PAGEEDITOR_WIKI'] = $userPage->getFullUrl();
 		$body = strtr( $body, $keys );
 		$body = wordwrap( $body, 72 );
@@ -406,8 +494,6 @@ class EmailNotification {
 		$this->body    = $body;
 	}
 
-
-
 	/**
 	 * Does the per-user customizations to a notification e-mail (name,
 	 * timestamp in proper timezone, etc) and sends it out.
@@ -435,9 +521,32 @@ class EmailNotification {
 			$wgLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
 			$body);
 
-		$error = userMailer( $to, $this->from, $this->subject, $body, $this->replyto );
-		return ($error == '');
+		return userMailer($to, $this->from, $this->subject, $body, $this->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
-?>
+