* Use local context instead of global variables

* Call Linker methods statically

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index b432a98..52501e4 100644 (file)
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -34,14 +34,13 @@ class SpecialEmailUser extends UnlistedSpecialPage {
        }
 
        protected function getFormFields() {
-               global $wgUser;
                return array(
                        'From' => array(
                                'type' => 'info',
                                'raw' => 1,
-                               'default' => $this->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' => $this->getSkin()->link(
+                               'default' => Linker::link(
                                        $this->mTargetObj->getUserPage(),
                                        htmlspecialchars( $this->mTargetObj->getName() )
                                ),
@@ -78,53 +77,47 @@ 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( $this->mTarget != '' ) {
                                $ret = ( $ret == 'notarget' ) ? 'emailnotarget' : ( $ret . 'text' );
-                               $wgOut->addHTML( '<p class="error">' . wfMessage( $ret )->parse() . '</p>' );
+                               $out->addHTML( '<p class="error">' . wfMessage( $ret )->parse() . '</p>' );
                        }
-                       $wgOut->addHTML( self::userForm( $this->mTarget ) );
+                       $out->addHTML( self::userForm( $this->mTarget ) );
                        return false;
                }
 
@@ -142,13 +135,13 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        return false;
                }
 
-               $wgOut->setPageTitle( wfMsg( 'emailpage' ) );
+               $out->setPageTitle( wfMsg( '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() );
+                       $out->setPageTitle( wfMsg( 'emailsent' ) );
+                       $out->addWikiMsg( 'emailsenttext' );
+                       $out->returnToMain( false, $this->mTargetObj->getUserPage() );
                }
        }