X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialEmailuser.php;h=900a2c328ba8642f556513d0443fd2558b4c7618;hb=97245b257cc231e26365c34be8351c5735243ab3;hp=2c6e1397e63b27e45ec069fcf5b8b31e857d8009;hpb=2ca68a256dae9a27b3b79f950eb7ef69c337fe60;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 2c6e1397e6..900a2c328b 100644
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -1,58 +1,63 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/**
- *
- */
 require_once('UserMailer.php');
 
+/**
+ * @todo document
+ */
 function wfSpecialEmailuser( $par ) {
 	global $wgUser, $wgOut, $wgRequest, $wgEnableEmail, $wgEnableUserEmail;
 
 	if( !( $wgEnableEmail && $wgEnableUserEmail ) ) {
-		$wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
+		$wgOut->showErrorPage( "nosuchspecialpage", "nospecialpagetext" );
 		return;
 	}
-	
+
 	if( !$wgUser->canSendEmail() ) {
 		wfDebug( "User can't send.\n" );
-		$wgOut->errorpage( "mailnologin", "mailnologintext" );
+		$wgOut->showErrorPage( "mailnologin", "mailnologintext" );
 		return;
 	}
-	
+
 	$action = $wgRequest->getVal( 'action' );
 	$target = isset($par) ? $par : $wgRequest->getVal( 'target' );
 	if ( "" == $target ) {
 		wfDebug( "Target is empty.\n" );
-		$wgOut->errorpage( "notargettitle", "notargettext" );
+		$wgOut->showErrorPage( "notargettitle", "notargettext" );
 		return;
 	}
-	
+
 	$nt = Title::newFromURL( $target );
 	if ( is_null( $nt ) ) {
 		wfDebug( "Target is invalid title.\n" );
-		$wgOut->errorpage( "notargettitle", "notargettext" );
+		$wgOut->showErrorPage( "notargettitle", "notargettext" );
 		return;
 	}
-	
+
 	$nu = User::newFromName( $nt->getText() );
 	if( is_null( $nu ) || !$nu->canReceiveEmail() ) {
 		wfDebug( "Target is invalid user or can't receive.\n" );
-		$wgOut->errorpage( "noemailtitle", "noemailtext" );
+		$wgOut->showErrorPage( "noemailtitle", "noemailtext" );
 		return;
 	}
 
-	$address = $nu->getEmail();
-	$f = new EmailUserForm( $nu->getName() . " <{$address}>", $target );
+	$f = new EmailUserForm( $nu );
 
 	if ( "success" == $action ) {
-		$f->showSuccess();
+		$f->showSuccess( $nu );
 	} else if ( "submit" == $action && $wgRequest->wasPosted() &&
-		$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+				$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) 
+	{
+		# Check against the rate limiter
+		if( $wgUser->pingLimiter( 'emailuser' ) ) {
+			$wgOut->rateLimited();
+			return;
+		}
+
 		$f->doSubmit();
 	} else {
 		$f->showForm();
@@ -60,22 +65,24 @@ function wfSpecialEmailuser( $par ) {
 }
 
 /**
- * @todo document
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Implements the Special:Emailuser web interface, and invokes userMailer for sending the email message.
+ * @addtogroup SpecialPage
  */
 class EmailUserForm {
 
-	var $mAddress;
 	var $target;
 	var $text, $subject;
+	var $cc_me;     // Whether user requested to be sent a separate copy of their email.
 
-	function EmailUserForm( $addr, $target ) {
+	/**
+	 * @param User $target
+	 */
+	function EmailUserForm( $target ) {
 		global $wgRequest;
-		$this->mAddress = $addr;
 		$this->target = $target;
 		$this->text = $wgRequest->getText( 'wpText' );
 		$this->subject = $wgRequest->getText( 'wpSubject' );
+		$this->cc_me = $wgRequest->getBool( 'wpCCMe' );
 	}
 
 	function showForm() {
@@ -84,22 +91,23 @@ class EmailUserForm {
 		$wgOut->setPagetitle( wfMsg( "emailpage" ) );
 		$wgOut->addWikiText( wfMsg( "emailpagetext" ) );
 
-		if ( $this->subject === "" ) { 
-			$this->subject = wfMsg( "defemailsubject" ); 
+		if ( $this->subject === "" ) {
+			$this->subject = wfMsg( "defemailsubject" );
 		}
 
 		$emf = wfMsg( "emailfrom" );
 		$sender = $wgUser->getName();
 		$emt = wfMsg( "emailto" );
-		$rcpt = str_replace( "_", " ", $this->target );
+		$rcpt = $this->target->getName();
 		$emr = wfMsg( "emailsubject" );
 		$emm = wfMsg( "emailmessage" );
 		$ems = wfMsg( "emailsend" );
+		$emc = wfMsg( "emailccme" );
 		$encSubject = htmlspecialchars( $this->subject );
-		
-		$titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
+
+		$titleObj = SpecialPage::getTitleFor( "Emailuser" );
 		$action = $titleObj->escapeLocalURL( "target=" .
-			urlencode( $this->target ) . "&action=submit" );
+			urlencode( $this->target->getName() ) . "&action=submit" );
 		$token = $wgUser->editToken();
 
 		$wgOut->addHTML( "
@@ -117,9 +125,10 @@ class EmailUserForm {
 </td>
 </tr>
 </table>
-<span id='wpTextLabel'><label for=\"wpText\">{$emm}:</label><br></span>
+<span id='wpTextLabel'><label for=\"wpText\">{$emm}:</label><br /></span>
 <textarea name=\"wpText\" rows='20' cols='80' wrap='virtual' style=\"width: 100%;\">" . htmlspecialchars( $this->text ) .
 "</textarea>
+" . wfCheckLabel( $emc, 'wpCCMe', 'wpCCMe', $wgUser->getBoolOption( 'ccmeonemails' ) ) . "<br />
 <input type='submit' name=\"wpSend\" value=\"{$ems}\" />
 <input type='hidden' name='wpEditToken' value=\"$token\" />
 </form>\n" );
@@ -128,32 +137,52 @@ class EmailUserForm {
 
 	function doSubmit() {
 		global $wgOut, $wgUser;
-	    
-		$from = wfQuotedPrintable( $wgUser->getName() ) . " <" . $wgUser->getEmail() . ">";
-		$subject = wfQuotedPrintable( $this->subject );
-		
-		if (wfRunHooks('EmailUser', array(&$this->mAddress, &$from, &$subject, &$this->text))) {
-			
-			$mailResult = userMailer( $this->mAddress, $from, $subject, $this->text );
-			
+
+		$to = new MailAddress( $this->target );
+		$from = new MailAddress( $wgUser );
+		$subject = $this->subject;
+
+		if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
+
+			$mailResult = userMailer( $to, $from, $subject, $this->text );
+
 			if( WikiError::isError( $mailResult ) ) {
 				$wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
 			} else {
-				$titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
-				$encTarget = wfUrlencode( $this->target );
+				
+				// if the user requested a copy of this mail, do this now,
+				// unless they are emailing themselves, in which case one copy of the message is sufficient.
+				if ($this->cc_me && $to != $from) {
+					$cc_subject = wfMsg('emailccsubject', $this->target->getName(), $subject);
+					if( wfRunHooks( 'EmailUser', array( &$from, &$from, &$cc_subject, &$this->text ) ) ) {
+						$ccResult = userMailer( $from, $from, $cc_subject, $this->text );
+						if( WikiError::isError( $ccResult ) ) {
+							// At this stage, the user's CC mail has failed, but their 
+							// original mail has succeeded. It's unlikely, but still, what to do?
+							// We can either show them an error, or we can say everything was fine,
+							// or we can say we sort of failed AND sort of succeeded. Of these options, 
+							// simply saying there was an error is probably best.
+							$wgOut->addHTML( wfMsg( "usermailererror" ) . $ccResult);
+							return;
+						}
+					}
+				}
+				
+				$titleObj = SpecialPage::getTitleFor( "Emailuser" );
+				$encTarget = wfUrlencode( $this->target->getName() );
 				$wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
-				wfRunHooks('EmailUserComplete', array($this->mAddress, $from, $subject, $this->text));
+				wfRunHooks( 'EmailUserComplete', array( $to, $from, $subject, $this->text ) );
 			}
 		}
 	}
 
-	function showSuccess() {
-		global $wgOut, $wgUser;
+	function showSuccess( &$user ) {
+		global $wgOut;
 
 		$wgOut->setPagetitle( wfMsg( "emailsent" ) );
 		$wgOut->addHTML( wfMsg( "emailsenttext" ) );
 
-		$wgOut->returnToMain( false );
+		$wgOut->returnToMain( false, $user->getUserPage() );
 	}
 }
 ?>