revert r106095, fix apparently not this simple
[lhc/web/wiklou.git] / includes / specials / SpecialEmailuser.php
index 851be6b..314da72 100644 (file)
 class SpecialEmailUser extends UnlistedSpecialPage {
        protected $mTarget;
 
-       public function __construct(){
+       public function __construct() {
                parent::__construct( 'Emailuser' );
        }
 
-       protected function getFormFields(){
-               global $wgUser;
+       protected function getFormFields() {
                return array(
                        'From' => array(
                                'type' => 'info',
                                'raw' => 1,
-                               'default' => $wgUser->getSkin()->link(
-                                       $wgUser->getUserPage(),
-                                       htmlspecialchars( $wgUser->getName() )
+                               'default' => Linker::link(
+                                       $this->getUser()->getUserPage(),
+                                       htmlspecialchars( $this->getUser()->getName() )
                                ),
                                'label-message' => 'emailfrom',
                                'id' => 'mw-emailuser-sender',
@@ -49,7 +48,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        'To' => array(
                                'type' => 'info',
                                'raw' => 1,
-                               'default' => $wgUser->getSkin()->link(
+                               'default' => Linker::link(
                                        $this->mTargetObj->getUserPage(),
                                        htmlspecialchars( $this->mTargetObj->getName() )
                                ),
@@ -62,7 +61,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        ),
                        'Subject' => array(
                                'type' => 'text',
-                               'default' => wfMsgExt( 'defemailsubject', array( 'content', 'parsemag' ) ),
+                               'default' => wfMsgExt( 'defemailsubject', array( 'content', 'parsemag' ), $this->getUser()->getName() ),
                                'label-message' => 'emailsubject',
                                'maxlength' => 200,
                                'size' => 60,
@@ -78,59 +77,53 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        'CCMe' => array(
                                'type' => 'check',
                                'label-message' => 'emailccme',
-                               'default' => $wgUser->getBoolOption( 'ccmeonemails' ),
+                               'default' => $this->getUser()->getBoolOption( 'ccmeonemails' ),
                        ),
                );
        }
 
        public function execute( $par ) {
-               global $wgRequest, $wgOut, $wgUser;
-
                $this->setHeaders();
                $this->outputHeader();
-               $wgOut->addModuleStyles( 'mediawiki.special' );
+               $out = $this->getOutput();
+               $out->addModuleStyles( 'mediawiki.special' );
                $this->mTarget = is_null( $par )
-                       ? $wgRequest->getVal( 'wpTarget', $wgRequest->getVal( 'target', '' ) )
+                       ? $this->getRequest()->getVal( 'wpTarget', $this->getRequest()->getVal( 'target', '' ) )
                        : $par;
                // error out if sending user cannot do this
-               $error = self::getPermissionsError( $wgUser, $wgRequest->getVal( 'wpEditToken' ) );
+               $error = self::getPermissionsError( $this->getUser(), $this->getRequest()->getVal( 'wpEditToken' ) );
                switch ( $error ) {
                        case null:
                                # Wahey!
                                break;
                        case 'badaccess':
-                               $wgOut->permissionRequired( 'sendemail' );
-                               return;
+                               throw new PermissionsError( 'sendemail' );
                        case 'blockedemailuser':
-                               $wgOut->blockedPage();
-                               return;
+                               throw new UserBlockedError( $this->getUser()->mBlock );
                        case 'actionthrottledtext':
-                               $wgOut->rateLimited();
-                               return;
+                               throw new ThrottledError;
                        case 'mailnologin':
                        case 'usermaildisabled':
-                               $wgOut->showErrorPage( $error, "{$error}text" );
-                               return;
+                               throw new  ErrorPageError( $error, "{$error}text" );
                        default:
                                # It's a hook error
                                list( $title, $msg, $params ) = $error;
-                               $wgOut->showErrorPage( $title, $msg, $params );
-                               return;
+                               throw new  ErrorPageError( $title, $msg, $params );
                }
                // Got a valid target user name? Else ask for one.
                $ret = self::getTarget( $this->mTarget );
-               if( ! $ret instanceof User ){
+               if( !$ret instanceof User ) {
                        if( $this->mTarget != '' ) {
-                               $ret = ( $ret == 'notarget' ) ? 'emailnotarget' : ( $ret . 'text' ) ;
-                               $wgOut->addHtml ( '<p class="error">' . wfMessage( $ret )->parse() . '</p>' );
+                               $ret = ( $ret == 'notarget' ) ? 'emailnotarget' : ( $ret . 'text' );
+                               $out->wrapWikiMsg( "<p class='error'>$1</p>", $ret );
                        }
-                       $wgOut->addHtml (self::userForm( $this->mTarget ) );
+                       $out->addHTML( $this->userForm( $this->mTarget ) );
                        return false;
                }
 
                $this->mTargetObj = $ret;
 
-               $form = new HTMLForm( $this->getFormFields() );
+               $form = new HTMLForm( $this->getFormFields(), $this->getContext() );
                $form->addPreText( wfMsgExt( 'emailpagetext', 'parseinline' ) );
                $form->setSubmitText( wfMsg( 'emailsend' ) );
                $form->setTitle( $this->getTitle() );
@@ -138,17 +131,17 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                $form->setWrapperLegend( wfMsgExt( 'email-legend', 'parsemag' ) );
                $form->loadData();
 
-               if( !wfRunHooks( 'EmailUserForm', array( &$form ) ) ){
+               if( !wfRunHooks( 'EmailUserForm', array( &$form ) ) ) {
                        return false;
                }
 
-               $wgOut->setPagetitle( wfMsg( 'emailpage' ) );
+               $out->setPageTitle( $this->msg( 'emailpage' ) );
                $result = $form->show();
 
-               if( $result === true || ( $result instanceof Status && $result->isGood() ) ){
-                       $wgOut->setPagetitle( wfMsg( 'emailsent' ) );
-                       $wgOut->addWikiMsg( 'emailsenttext' );
-                       $wgOut->returnToMain( false, $this->mTargetObj->getUserPage() );
+               if( $result === true || ( $result instanceof Status && $result->isGood() ) ) {
+                       $out->setPageTitle( $this->msg( 'emailsent' ) );
+                       $out->addWikiMsg( 'emailsenttext' );
+                       $out->returnToMain( false, $this->mTargetObj->getUserPage() );
                }
        }
 
@@ -168,10 +161,10 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                if( !$nu instanceof User || !$nu->getId() ) {
                        wfDebug( "Target is invalid user.\n" );
                        return 'notarget';
-               } else if ( !$nu->isEmailConfirmed() ) {
+               } elseif ( !$nu->isEmailConfirmed() ) {
                        wfDebug( "User has no valid email.\n" );
                        return 'noemail';
-               } else if ( !$nu->canReceiveEmail() ) {
+               } elseif ( !$nu->canReceiveEmail() ) {
                        wfDebug( "User does not allow user emails.\n" );
                        return 'nowikiemail';
                }
@@ -188,7 +181,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
         */
        public static function getPermissionsError( $user, $editToken ) {
                global $wgEnableEmail, $wgEnableUserEmail;
-               if( !$wgEnableEmail || !$wgEnableUserEmail ){
+               if( !$wgEnableEmail || !$wgEnableUserEmail ) {
                        return 'usermaildisabled';
                }
 
@@ -196,7 +189,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        return 'badaccess';
                }
 
-               if( !$user->isEmailConfirmed() ){
+               if( !$user->isEmailConfirmed() ) {
                        return 'mailnologin';
                }
 
@@ -219,21 +212,23 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 
                return null;
        }
-       
+
        /**
         * Form to ask for target user name.
-        * @author purodha
-        * @param $name string User name submitted.
-        * @return string form asking for user name.
+        *
+        * @param $name String: user name submitted.
+        * @return String: form asking for user name.
         */
-       static function userForm( $name ) {
-               $string =       Xml::openElement( 'form', array( 'method' => 'get', 'action' => '', 'id' => 'askusername' ) ) .
-                               Xml::openElement( 'fieldset' ) .
-                               Html::rawElement( 'legend', null, wfMessage( 'emailtarget' )->parse() ) .
-                               Xml::inputLabel( wfMessage('emailusername')->text(), 'target', 'emailusertarget', 30, $name ) . ' ' .
-                               Xml::submitButton( wfMessage('emailusernamesubmit')->text() ) .
-                               Xml::closeElement( 'fieldset' ) .
-                               Xml::closeElement( 'form' ) . "\n";
+       protected function userForm( $name ) {
+               global $wgScript;
+               $string = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'askusername' ) ) .
+                       Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
+                       Xml::openElement( 'fieldset' ) .
+                       Html::rawElement( 'legend', null, wfMessage( 'emailtarget' )->parse() ) .
+                       Xml::inputLabel( wfMessage( 'emailusername' )->text(), 'target', 'emailusertarget', 30, $name ) . ' ' .
+                       Xml::submitButton( wfMessage( 'emailusernamesubmit' )->text() ) .
+                       Xml::closeElement( 'fieldset' ) .
+                       Xml::closeElement( 'form' ) . "\n";
                return $string;
        }
 
@@ -249,7 +244,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                global $wgUser, $wgUserEmailUseReplyTo;
 
                $target = self::getTarget( $data['Target'] );
-               if( !$target instanceof User ){
+               if( !$target instanceof User ) {
                        return wfMsgExt( $target . 'text', 'parse' );
                }
                $to = new MailAddress( $target );