Code style tweaks per brion's suggestions on Wikitech-l

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

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 83d02b8..16270b1 100644 (file)
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -14,42 +14,42 @@ 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;
        }
 
        $f = new EmailUserForm( $nu );
 
        if ( "success" == $action ) {
-               $f->showSuccess();
+               $f->showSuccess( $nu );
        } else if ( "submit" == $action && $wgRequest->wasPosted() &&
                $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
                $f->doSubmit();
@@ -67,6 +67,7 @@ class EmailUserForm {
 
        var $target;
        var $text, $subject;
+       var $cc_me;     // Whether user requested to be sent a separate copy of their email.
 
        /**
         * @param User $target
@@ -76,6 +77,7 @@ class EmailUserForm {
                $this->target = $target;
                $this->text = $wgRequest->getText( 'wpText' );
                $this->subject = $wgRequest->getText( 'wpSubject' );
+               $this->cc_me = $wgRequest->getBool( 'wpCCMe' );
        }
 
        function showForm() {
@@ -84,8 +86,8 @@ 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" );
@@ -95,9 +97,10 @@ class EmailUserForm {
                $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->getName() ) . "&action=submit" );
                $token = $wgUser->editToken();
@@ -117,9 +120,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' ) . "<br />
 <input type='submit' name=\"wpSend\" value=\"{$ems}\" />
 <input type='hidden' name='wpEditToken' value=\"$token\" />
 </form>\n" );
@@ -128,19 +132,38 @@ class EmailUserForm {
 
        function doSubmit() {
                global $wgOut, $wgUser;
-           
+
                $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" );
+                               
+                               // 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( $to, $from, $subject, $this->text ) );
@@ -148,13 +171,13 @@ class EmailUserForm {
                }
        }
 
-       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() );
        }
 }
 ?>