X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialPage.php;h=c859f004c0aca66c816066e7e128e138224e46ce;hb=53f96171cccb378824f8708c3fe41cfb0fcdd62e;hp=6ab1fdf39ea3df7a9b351ee035589559c7d0c9be;hpb=e943d7ed3f6e2ae9395b15cc8fdea699544b3b7e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 6ab1fdf39e..c859f004c0 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -28,255 +28,55 @@
  * @ingroup SpecialPage
  */
 class SpecialPage {
-	/**#@+
-	 * @access private
-	 */
-	/**
-	 * The canonical name of this special page
-	 * Also used for the default <h1> heading, @see getDescription()
-	 */
-	var $mName;
-	/**
-	 * The local name of this special page
-	 */
-	var $mLocalName;
-	/**
-	 * Minimum user level required to access this page, or "" for anyone.
-	 * Also used to categorise the pages in Special:Specialpages
-	 */
-	var $mRestriction;
-	/**
-	 * Listed in Special:Specialpages?
-	 */
-	var $mListed;
-	/**
-	 * Function name called by the default execute()
-	 */
-	var $mFunction;
-	/**
-	 * File which needs to be included before the function above can be called
-	 */
-	var $mFile;
-	/**
-	 * Whether or not this special page is being included from an article
-	 */
-	var $mIncluding;
-	/**
-	 * Whether the special page can be included in an article
-	 */
-	var $mIncludable;
-	/**
-	 * Query parameters that can be passed through redirects
-	 */
-	var $mAllowedRedirectParams = array();
-	/**
-	 * Query parameteres added by redirects
-	 */
-	var $mAddedRedirectParams = array();
-	/**
-	 * Current request
-	 * @var WebRequest 
-	 */
-	protected $mRequest;
-	/**
-	 * Current output page
-	 * @var OutputPage
-	 */
-	protected $mOutput;
-	/**
-	 * Full title including $par
-	 * @var Title
-	 */
-	protected $mFullTitle;
-		
-	/**
-	 * List of special pages, followed by parameters.
-	 * If the only parameter is a string, that is the page name.
-	 * Otherwise, it is an array. The format is one of:
-	 ** array( 'SpecialPage', name, right )
-	 ** array( 'IncludableSpecialPage', name, right, listed? )
-	 ** array( 'UnlistedSpecialPage', name, right )
-	 ** array( 'SpecialRedirectToSpecial', name, page to redirect to, special page param, ... )
-	 */
-	static public $mList = array(
-		# Maintenance Reports
-		'BrokenRedirects'           => 'BrokenRedirectsPage',
-		'Deadendpages'              => 'DeadendpagesPage',
-		'DoubleRedirects'           => 'DoubleRedirectsPage',
-		'Longpages'                 => 'LongpagesPage',
-		'Ancientpages'              => 'AncientpagesPage',
-		'Lonelypages'               => 'LonelypagesPage',
-		'Fewestrevisions'           => 'FewestrevisionsPage',
-		'Withoutinterwiki'          => 'WithoutinterwikiPage',
-		'Protectedpages'            => 'SpecialProtectedpages',
-		'Protectedtitles'           => 'SpecialProtectedtitles',
-		'Shortpages'                => 'ShortpagesPage',
-		'Uncategorizedcategories'   => 'UncategorizedcategoriesPage',
-		'Uncategorizedimages'       => 'UncategorizedimagesPage',
-		'Uncategorizedpages'        => 'UncategorizedpagesPage',
-		'Uncategorizedtemplates'    => 'UncategorizedtemplatesPage',
-		'Unusedcategories'          => 'UnusedcategoriesPage',
-		'Unusedimages'              => 'UnusedimagesPage',
-		'Unusedtemplates'           => 'UnusedtemplatesPage',
-		'Unwatchedpages'            => 'UnwatchedpagesPage',
-		'Wantedcategories'          => 'WantedcategoriesPage',
-		'Wantedfiles'               => 'WantedfilesPage',
-		'Wantedpages'               => 'WantedpagesPage',
-		'Wantedtemplates'           => 'WantedtemplatesPage',
-
-		# List of pages
-		'Allpages'                  => 'SpecialAllpages',
-		'Prefixindex'               => 'SpecialPrefixindex',
-		'Categories'                => 'SpecialCategories',
-		'Disambiguations'           => 'DisambiguationsPage',
-		'Listredirects'             => 'ListredirectsPage',
-
-		# Login/create account
-		'Userlogin'                 => 'LoginForm',
-		'CreateAccount'             => array( 'SpecialRedirectToSpecial', 'CreateAccount', 'Userlogin', 'signup', array( 'uselang' ) ),
-
-		# Users and rights
-		'Block'                     => 'SpecialBlock',
-		'Unblock'                   => 'SpecialUnblock',
-		'BlockList'                 => 'SpecialBlockList',
-		'Resetpass'                 => 'SpecialResetpass',
-		'DeletedContributions'      => 'DeletedContributionsPage',
-		'Preferences'               => 'SpecialPreferences',
-		'Contributions'             => 'SpecialContributions',
-		'Listgrouprights'           => 'SpecialListGroupRights',
-		'Listusers'                 => 'SpecialListusers',
-		'Listadmins'                => array( 'SpecialRedirectToSpecial', 'Listadmins', 'Listusers', 'sysop' ),
-		'Listbots'                  => array( 'SpecialRedirectToSpecial', 'Listbots', 'Listusers', 'bot' ),
-		'Activeusers'               => 'SpecialActiveUsers',
-		'Userrights'                => 'UserrightsPage',
-		'DisableAccount'            => 'SpecialDisableAccount',
-		'EditWatchlist'             => 'SpecialEditWatchlist',
-
-		# Recent changes and logs
-		'Newimages'                 => array( 'IncludableSpecialPage', 'Newimages' ),
-		'Log'                       => 'SpecialLog',
-		'Watchlist'                 => 'SpecialWatchlist',
-		'Newpages'                  => 'SpecialNewpages',
-		'Recentchanges'             => 'SpecialRecentchanges',
-		'Recentchangeslinked'       => 'SpecialRecentchangeslinked',
-		'Tags'                      => 'SpecialTags',
-
-		# Media reports and uploads
-		'Listfiles'                 => 'SpecialListFiles',
-		'Filepath'                  => 'SpecialFilepath',
-		'MIMEsearch'                => 'MIMEsearchPage',
-		'FileDuplicateSearch'       => 'FileDuplicateSearchPage',
-		'Upload'                    => 'SpecialUpload',
-		'UploadStash'               => 'SpecialUploadStash',
-
-		# Wiki data and tools
-		'Statistics'                => 'SpecialStatistics',
-		'Allmessages'               => 'SpecialAllmessages',
-		'Version'                   => 'SpecialVersion',
-		'Lockdb'                    => 'SpecialLockdb',
-		'Unlockdb'                  => 'SpecialUnlockdb',
-
-		# Redirecting special pages
-		'LinkSearch'                => 'LinkSearchPage',
-		'Randompage'                => 'Randompage',
-		'Randomredirect'            => 'SpecialRandomredirect',
-
-		# High use pages
-		'Mostlinkedcategories'      => 'MostlinkedCategoriesPage',
-		'Mostimages'                => 'MostimagesPage',
-		'Mostlinked'                => 'MostlinkedPage',
-		'Mostlinkedtemplates'       => 'MostlinkedTemplatesPage',
-		'Mostcategories'            => 'MostcategoriesPage',
-		'Mostrevisions'             => 'MostrevisionsPage',
-
-		# Page tools
-		'ComparePages'              => 'SpecialComparePages',
-		'Export'                    => 'SpecialExport',
-		'Import'                    => 'SpecialImport',
-		'Undelete'                  => 'SpecialUndelete',
-		'Whatlinkshere'             => 'SpecialWhatlinkshere',
-		'MergeHistory'              => 'SpecialMergeHistory',
-
-		# Other
-		'Booksources'               => 'SpecialBookSources',
-
-		# Unlisted / redirects
-		'Blankpage'                 => 'SpecialBlankpage',
-		'Blockme'                   => 'SpecialBlockme',
-		'Emailuser'                 => 'SpecialEmailUser',
-		'Movepage'                  => 'MovePageForm',
-		'Mycontributions'           => 'SpecialMycontributions',
-		'Mypage'                    => 'SpecialMypage',
-		'Mytalk'                    => 'SpecialMytalk',
-		'Myuploads'                 => 'SpecialMyuploads',
-		'PermanentLink'             => 'SpecialPermanentLink',
-		'Revisiondelete'            => 'SpecialRevisionDelete',
-		'RevisionMove'              => 'SpecialRevisionMove',
-		'Specialpages'              => 'SpecialSpecialpages',
-		'Userlogout'                => 'SpecialUserlogout',
-	);
-
-	static public $mAliases;
-	static public $mListInitialised = false;
-
-	/**#@-*/
 
-	/**
-	 * Initialise the special page list
-	 * This must be called before accessing SpecialPage::$mList
-	 */
-	static function initList() {
-		global $wgSpecialPages;
-		global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication;
+	// The canonical name of this special page
+	// Also used for the default <h1> heading, @see getDescription()
+	protected $mName;
 
-		if ( self::$mListInitialised ) {
-			return;
-		}
-		wfProfileIn( __METHOD__ );
+	// The local name of this special page
+	private $mLocalName;
 
-		# Better to set this now, to avoid infinite recursion in carelessly written hooks
-		self::$mListInitialised = true;
+	// Minimum user level required to access this page, or "" for anyone.
+	// Also used to categorise the pages in Special:Specialpages
+	private $mRestriction;
 
-		if( !$wgDisableCounters ) {
-			self::$mList['Popularpages'] = 'PopularpagesPage';
-		}
+	// Listed in Special:Specialpages?
+	private $mListed;
 
-		if( !$wgDisableInternalSearch ) {
-			self::$mList['Search'] = 'SpecialSearch';
-		}
+	// Function name called by the default execute()
+	private $mFunction;
 
-		if( $wgEmailAuthentication ) {
-			self::$mList['Confirmemail'] = 'EmailConfirmation';
-			self::$mList['Invalidateemail'] = 'EmailInvalidation';
-		}
+	// File which needs to be included before the function above can be called
+	private $mFile;
+
+	// Whether or not this special page is being included from an article
+	protected $mIncluding;
+
+	// Whether the special page can be included in an article
+	protected $mIncludable;
 
-		# Add extension special pages
-		self::$mList = array_merge( self::$mList, $wgSpecialPages );
+	/**
+	 * Current request context
+	 * @var IContextSource
+	 */
+	protected $mContext;
 
-		# Run hooks
-		# This hook can be used to remove undesired built-in special pages
-		wfRunHooks( 'SpecialPage_initList', array( &self::$mList ) );
-		wfProfileOut( __METHOD__ );
+	/**
+	 * Initialise the special page list
+	 * This must be called before accessing SpecialPage::$mList
+	 * @deprecated since 1.18
+	 */
+	static function initList() {
+		wfDeprecated( __METHOD__, '1.18' );
+		// Noop
 	}
 
+	/**
+	 * @deprecated since 1.18
+	 */
 	static function initAliasList() {
-		if ( !is_null( self::$mAliases ) ) {
-			return;
-		}
-
-		global $wgContLang;
-		$aliases = $wgContLang->getSpecialPageAliases();
-		$missingPages = self::$mList;
-		self::$mAliases = array();
-		foreach ( $aliases as $realName => $aliasList ) {
-			foreach ( $aliasList as $alias ) {
-				self::$mAliases[$wgContLang->caseFold( $alias )] = $realName;
-			}
-			unset( $missingPages[$realName] );
-		}
-		foreach ( $missingPages as $name => $stuff ) {
-			self::$mAliases[$wgContLang->caseFold( $name )] = $name;
-		}
+		wfDeprecated( __METHOD__, '1.18' );
+		// Noop
 	}
 
 	/**
@@ -285,19 +85,12 @@ class SpecialPage {
 	 *
 	 * @param $alias String
 	 * @return String or false
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function resolveAlias( $alias ) {
-		global $wgContLang;
-
-		if ( !self::$mListInitialised ) self::initList();
-		if ( is_null( self::$mAliases ) ) self::initAliasList();
-		$caseFoldedAlias = $wgContLang->caseFold( $alias );
-		$caseFoldedAlias = str_replace( ' ', '_', $caseFoldedAlias );
-		if ( isset( self::$mAliases[$caseFoldedAlias] ) ) {
-			return self::$mAliases[$caseFoldedAlias];
-		} else {
-			return false;
-		}
+		wfDeprecated( __METHOD__, '1.18' );
+		list( $name, /*...*/ ) = SpecialPageFactory::resolveAlias( $alias );
+		return $name;
 	}
 
 	/**
@@ -307,16 +100,10 @@ class SpecialPage {
 	 *
 	 * @param $alias String
 	 * @return Array
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function resolveAliasWithSubpage( $alias ) {
-		$bits = explode( '/', $alias, 2 );
-		$name = self::resolveAlias( $bits[0] );
-		if( !isset( $bits[1] ) ) { // bug 2087
-			$par = null;
-		} else {
-			$par = $bits[1];
-		}
-		return array( $name, $par );
+		return SpecialPageFactory::resolveAlias( $alias );
 	}
 
 	/**
@@ -325,14 +112,11 @@ class SpecialPage {
 	 * an associative record to $wgSpecialPages. This avoids autoloading SpecialPage.
 	 *
 	 * @param $page SpecialPage
-	 * Deprecated in 1.7, warnings in 1.17, might be removed in 1.20
+	 * @deprecated since 1.7, warnings in 1.17, might be removed in 1.20
 	 */
 	static function addPage( &$page ) {
-		wfDeprecated( __METHOD__ );
-		if ( !self::$mListInitialised ) {
-			self::initList();
-		}
-		self::$mList[$page->mName] = $page;
+		wfDeprecated( __METHOD__, '1.7' );
+		SpecialPageFactory::getList()->{$page->mName} = $page;
 	}
 
 	/**
@@ -340,47 +124,37 @@ class SpecialPage {
 	 *
 	 * @param $page Mixed: SpecialPage or string
 	 * @param $group String
+	 * @return null
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function setGroup( $page, $group ) {
-		global $wgSpecialPageGroups;
-		$name = is_object($page) ? $page->mName : $page;
-		$wgSpecialPageGroups[$name] = $group;
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::setGroup( $page, $group );
 	}
 
 	/**
-	 * Add a page to a certain display group for Special:SpecialPages
+	 * Get the group that the special page belongs in on Special:SpecialPage
 	 *
 	 * @param $page SpecialPage
+	 * @return null
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getGroup( &$page ) {
-		global $wgSpecialPageGroups;
-		static $specialPageGroupsCache = array();
-		if( isset($specialPageGroupsCache[$page->mName]) ) {
-			return $specialPageGroupsCache[$page->mName];
-		}
-		$msg = wfMessage('specialpages-specialpagegroup-'.strtolower($page->mName));
-		if ( !$msg->isBlank() ) {
-			$group = $msg->text();
-		} else {
-			$group = isset($wgSpecialPageGroups[$page->mName])
-				? $wgSpecialPageGroups[$page->mName]
-				: '-';
-		}
-		if( $group == '-' ) $group = 'other';
-		$specialPageGroupsCache[$page->mName] = $group;
-		return $group;
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getGroup( $page );
 	}
 
 	/**
 	 * Remove a special page from the list
 	 * Formerly used to disable expensive or dangerous special pages. The
 	 * preferred method is now to add a SpecialPage_initList hook.
+	 * @deprecated since 1.18
+	 *
+	 * @param $name String the page to remove
 	 */
 	static function removePage( $name ) {
-		if ( !self::$mListInitialised ) {
-			self::initList();
-		}
-		unset( self::$mList[$name] );
+		wfDeprecated( __METHOD__, '1.18' );
+		unset( SpecialPageFactory::getList()->$name );
 	}
 
 	/**
@@ -388,24 +162,11 @@ class SpecialPage {
 	 *
 	 * @param $name String: name of a special page
 	 * @return Boolean: true if a special page exists with this name
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function exists( $name ) {
-		global $wgContLang;
-		if ( !self::$mListInitialised ) {
-			self::initList();
-		}
-		if( !self::$mAliases ) {
-			self::initAliasList();
-		}
-
-		# Remove special pages inline parameters:
-		$bits = explode( '/', $name );
-		$name = $wgContLang->caseFold($bits[0]);
-
-		return
-			array_key_exists( $name, self::$mList )
-			or array_key_exists( $name, self::$mAliases )
-		;
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::exists( $name );
 	}
 
 	/**
@@ -413,86 +174,49 @@ class SpecialPage {
 	 *
 	 * @param $name String
 	 * @return SpecialPage object or null if the page doesn't exist
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getPage( $name ) {
-		if ( !self::$mListInitialised ) {
-			self::initList();
-		}
-		if ( array_key_exists( $name, self::$mList ) ) {
-			$rec = self::$mList[$name];
-			if ( is_string( $rec ) ) {
-				$className = $rec;
-				self::$mList[$name] = new $className;
-			} elseif ( is_array( $rec ) ) {
-				$className = array_shift( $rec );
-				self::$mList[$name] = MWFunction::newObj( $className, $rec );
-			}
-			return self::$mList[$name];
-		} else {
-			return null;
-		}
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getPage( $name );
 	}
 
 	/**
 	 * Get a special page with a given localised name, or NULL if there
 	 * is no such special page.
 	 *
+	 * @param $alias String
 	 * @return SpecialPage object or null if the page doesn't exist
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getPageByAlias( $alias ) {
-		$realName = self::resolveAlias( $alias );
-		if ( $realName ) {
-			return self::getPage( $realName );
-		} else {
-			return null;
-		}
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getPage( $alias );
 	}
 
 	/**
 	 * Return categorised listable special pages which are available
 	 * for the current user, and everyone.
 	 *
+	 * @param $user User object to check permissions, $wgUser will be used
+	 *              if not provided
 	 * @return Associative array mapping page's name to its SpecialPage object
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
-	static function getUsablePages() {
-		global $wgUser;
-		if ( !self::$mListInitialised ) {
-			self::initList();
-		}
-		$pages = array();
-
-		foreach ( self::$mList as $name => $rec ) {
-			$page = self::getPage( $name );
-			if ( $page->isListed()
-				&& (
-					!$page->isRestricted()
-					|| $page->userCanExecute( $wgUser )
-				)
-			) {
-				$pages[$name] = $page;
-			}
-		}
-		return $pages;
+	static function getUsablePages( User $user = null ) {
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getUsablePages( $user );
 	}
 
 	/**
 	 * Return categorised listable special pages for all users
 	 *
 	 * @return Associative array mapping page's name to its SpecialPage object
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getRegularPages() {
-		if ( !self::$mListInitialised ) {
-			self::initList();
-		}
-		$pages = array();
-
-		foreach ( self::$mList as $name => $rec ) {
-			$page = self::getPage( $name );
-			if ( $page->isListed() && !$page->isRestricted() ) {
-				$pages[$name] = $page;
-			}
-		}
-		return $pages;
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getRegularPages();
 	}
 
 	/**
@@ -500,25 +224,11 @@ class SpecialPage {
 	 * for the current user, but not for everyone
 	 *
 	 * @return Associative array mapping page's name to its SpecialPage object
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getRestrictedPages() {
-		global $wgUser;
-		if( !self::$mListInitialised ) {
-			self::initList();
-		}
-		$pages = array();
-
-		foreach( self::$mList as $name => $rec ) {
-			$page = self::getPage( $name );
-			if(
-				$page->isListed()
-				&& $page->isRestricted()
-				&& $page->userCanExecute( $wgUser )
-			) {
-				$pages[$name] = $page;
-			}
-		}
-		return $pages;
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getRestrictedPages();
 	}
 
 	/**
@@ -529,110 +239,15 @@ class SpecialPage {
 	 * Returns a title object if the page is redirected, false if there was no such special
 	 * page, and true if it was successful.
 	 *
-	 * @param $title          a title object
-	 * @param $including      output is being captured for use in {{special:whatever}}
-	 */
-	static function executePath( &$title, $including = false ) {
-		global $wgOut, $wgTitle, $wgRequest;
-		wfProfileIn( __METHOD__ );
-
-		# FIXME: redirects broken due to this call
-		$bits = explode( '/', $title->getDBkey(), 2 );
-		$name = $bits[0];
-		if( !isset( $bits[1] ) ) { // bug 2087
-			$par = null;
-		} else {
-			$par = $bits[1];
-		}
-		$page = SpecialPage::getPageByAlias( $name );
-		# Nonexistent?
-		if ( !$page ) {
-			if ( !$including ) {
-				$wgOut->setArticleRelated( false );
-				$wgOut->setRobotPolicy( 'noindex,nofollow' );
-				$wgOut->setStatusCode( 404 );
-				$wgOut->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
-			}
-			wfProfileOut( __METHOD__ );
-			return false;
-		}
-		
-		# Page exists, set the context
-		$page->setContext( $wgRequest, $wgOut );
-
-		# Check for redirect
-		if ( !$including ) {
-			$redirect = $page->getRedirect( $par );
-			$query = $page->getRedirectQuery();
-			if ( $redirect instanceof Title ) {
-				$url = $redirect->getFullUrl( $query );
-				$wgOut->redirect( $url );
-				wfProfileOut( __METHOD__ );
-				return $redirect;
-			} elseif( $redirect === true ) {
-				global $wgScript;
-				$url = $wgScript . '?' . wfArrayToCGI( $query );
-				$wgOut->redirect( $url );
-				wfProfileOut( __METHOD__ );
-				return $redirect;
-			}
-		}
-
-		# Redirect to canonical alias for GET commands
-		# Not for POST, we'd lose the post data, so it's best to just distribute
-		# the request. Such POST requests are possible for old extensions that
-		# generate self-links without being aware that their default name has
-		# changed.
-		if ( !$including && $name != $page->getLocalName() && !$wgRequest->wasPosted() ) {
-			$query = $_GET;
-			unset( $query['title'] );
-			$query = wfArrayToCGI( $query );
-			$title = $page->getTitle( $par );
-			$url = $title->getFullUrl( $query );
-			$wgOut->redirect( $url );
-			wfProfileOut( __METHOD__ );
-			return $redirect;
-		}
-
-		if ( $including && !$page->includable() ) {
-			wfProfileOut( __METHOD__ );
-			return false;
-		} elseif ( !$including ) {
-			$wgTitle = $page->getTitle();
-		}
-		$page->including( $including );
-
-		// Execute special page
-		$profName = 'Special:' . $page->name();
-		wfProfileIn( $profName );
-		$page->execute( $par );
-		wfProfileOut( $profName );
-		wfProfileOut( __METHOD__ );
-		return true;
-	}
-
-	/**
-	 * Just like executePath() except it returns the HTML instead of outputting it
-	 * Returns false if there was no such special page, or a title object if it was
-	 * a redirect.
-	 *
-	 * @return String: HTML fragment
+	 * @param $title          Title object
+	 * @param $context        IContextSource
+	 * @param $including      Bool output is being captured for use in {{special:whatever}}
+	 * @return Bool
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
-	static function capturePath( &$title ) {
-		global $wgOut, $wgTitle;
-
-		$oldTitle = $wgTitle;
-		$oldOut = $wgOut;
-		$wgOut = new OutputPage;
-		$wgOut->setTitle( $title );
-
-		$ret = SpecialPage::executePath( $title, true );
-		if ( $ret === true ) {
-			$ret = $wgOut->getHTML();
-		}
-		$wgTitle = $oldTitle;
-		$wgOut = $oldOut;
-		return $ret;
+	public static function executePath( &$title, IContextSource &$context, $including = false ) {
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::executePath( $title, $context, $including );
 	}
 
 	/**
@@ -642,42 +257,22 @@ class SpecialPage {
 	 * @param $subpage Mixed: boolean false, or string
 	 *
 	 * @return String
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getLocalNameFor( $name, $subpage = false ) {
-		global $wgContLang;
-		$aliases = $wgContLang->getSpecialPageAliases();
-		if ( isset( $aliases[$name][0] ) ) {
-			$name = $aliases[$name][0];
-		} else {
-			// Try harder in case someone misspelled the correct casing
-			$found = false;
-			foreach ( $aliases as $n => $values ) {
-				if ( strcasecmp( $name, $n ) === 0 ) {
-					wfWarn( "Found alias defined for $n when searching for " .
-						"special page aliases for $name. Case mismatch?" );
-					$name = $values[0];
-					$found = true;
-					break;
-				}
-			}
-			if ( !$found ) {
-				wfWarn( "Did not find alias for special page '$name'. " .
-					"Perhaps no aliases are defined for it?" );
-			}
-		}
-		if ( $subpage !== false && !is_null( $subpage ) ) {
-			$name = "$name/$subpage";
-		}
-		return $wgContLang->ucfirst( $name );
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getLocalNameFor( $name, $subpage );
 	}
 
 	/**
 	 * Get a localised Title object for a specified special page name
 	 *
+	 * @param $name String
+	 * @param $subpage String|Bool subpage string, or false to not use a subpage
 	 * @return Title object
 	 */
-	static function getTitleFor( $name, $subpage = false ) {
-		$name = self::getLocalNameFor( $name, $subpage );
+	public static function getTitleFor( $name, $subpage = false ) {
+		$name = SpecialPageFactory::getLocalNameFor( $name, $subpage );
 		if ( $name ) {
 			return Title::makeTitle( NS_SPECIAL, $name );
 		} else {
@@ -688,10 +283,12 @@ class SpecialPage {
 	/**
 	 * Get a localised Title object for a page name with a possibly unvalidated subpage
 	 *
+	 * @param $name String
+	 * @param $subpage String|Bool subpage string, or false to not use a subpage
 	 * @return Title object or null if the page doesn't exist
 	 */
-	static function getSafeTitleFor( $name, $subpage = false ) {
-		$name = self::getLocalNameFor( $name, $subpage );
+	public static function getSafeTitleFor( $name, $subpage = false ) {
+		$name = SpecialPageFactory::getLocalNameFor( $name, $subpage );
 		if ( $name ) {
 			return Title::makeTitleSafe( NS_SPECIAL, $name );
 		} else {
@@ -702,15 +299,13 @@ class SpecialPage {
 	/**
 	 * Get a title for a given alias
 	 *
+	 * @param $alias String
 	 * @return Title or null if there is no such alias
+	 * @deprecated since 1.18 call SpecialPageFactory method directly
 	 */
 	static function getTitleForAlias( $alias ) {
-		$name = self::resolveAlias( $alias );
-		if ( $name ) {
-			return self::getTitleFor( $name );
-		} else {
-			return null;
-		}
+		wfDeprecated( __METHOD__, '1.18' );
+		return SpecialPageFactory::getTitleForAlias( $alias );
 	}
 
 	/**
@@ -725,19 +320,27 @@ class SpecialPage {
 	 *
 	 * @param $name String: name of the special page, as seen in links and URLs
 	 * @param $restriction String: user right required, e.g. "block" or "delete"
-	 * @param $listed Boolean: whether the page is listed in Special:Specialpages
-	 * @param $function Callback: function called by execute(). By default it is constructed from $name
+	 * @param $listed Bool: whether the page is listed in Special:Specialpages
+	 * @param $function Callback|Bool: function called by execute(). By default it is constructed from $name
 	 * @param $file String: file which is included by execute(). It is also constructed from $name by default
-	 * @param $includable Boolean: whether the page can be included in normal pages
+	 * @param $includable Bool: whether the page can be included in normal pages
 	 */
-	public function __construct( $name = '', $restriction = '', $listed = true, $function = false, $file = 'default', $includable = false ) {
+	public function __construct(
+		$name = '', $restriction = '', $listed = true,
+		$function = false, $file = 'default', $includable = false
+	) {
 		$this->init( $name, $restriction, $listed, $function, $file, $includable );
 	}
 
 	/**
 	 * Do the real work for the constructor, mainly so __call() can intercept
 	 * calls to SpecialPage()
-	 * @see __construct() for param docs
+	 * @param $name String: name of the special page, as seen in links and URLs
+	 * @param $restriction String: user right required, e.g. "block" or "delete"
+	 * @param $listed Bool: whether the page is listed in Special:Specialpages
+	 * @param $function Callback|Bool: function called by execute(). By default it is constructed from $name
+	 * @param $file String: file which is included by execute(). It is also constructed from $name by default
+	 * @param $includable Bool: whether the page can be included in normal pages
 	 */
 	private function init( $name, $restriction, $listed, $function, $file, $includable ) {
 		$this->mName = $name;
@@ -745,12 +348,12 @@ class SpecialPage {
 		$this->mListed = $listed;
 		$this->mIncludable = $includable;
 		if ( !$function ) {
-			$this->mFunction = 'wfSpecial'.$name;
+			$this->mFunction = 'wfSpecial' . $name;
 		} else {
 			$this->mFunction = $function;
 		}
 		if ( $file === 'default' ) {
-			$this->mFile = dirname(__FILE__) . "/specials/Special$name.php";
+			$this->mFile = dirname( __FILE__ ) . "/specials/Special$name.php";
 		} else {
 			$this->mFile = $file;
 		}
@@ -762,13 +365,14 @@ class SpecialPage {
 	 *
 	 * @param $fName String Name of called method
 	 * @param $a Array Arguments to the method
-	 * @deprecated Call isn't deprecated, but SpecialPage::SpecialPage() is
+	 * @deprecated since 1.17, call parent::__construct()
 	 */
 	public function __call( $fName, $a ) {
+		// Deprecated messages now, remove in 1.19 or 1.20?
+		wfDeprecated( __METHOD__, '1.17' );
+
 		// Sometimes $fName is SpecialPage, sometimes it's specialpage. <3 PHP
-		if( strtolower( $fName ) == 'specialpage' ) {
-			// Debug messages now, warnings in 1.19 or 1.20?
-			wfDebug( "Deprecated SpecialPage::SpecialPage() called, use __construct();\n" );
+		if ( strtolower( $fName ) == 'specialpage' ) {
 			$name = isset( $a[0] ) ? $a[0] : '';
 			$restriction = isset( $a[1] ) ? $a[1] : '';
 			$listed = isset( $a[2] ) ? $a[2] : true;
@@ -782,40 +386,130 @@ class SpecialPage {
 		}
 	}
 
-	/**#@+
-	  * Accessor
-	  *
-	  * @deprecated
-	  */
-	function getName() { return $this->mName; }
-	function getRestriction() { return $this->mRestriction; }
-	function getFile() { return $this->mFile; }
-	function isListed() { return $this->mListed; }
-	/**#@-*/
-
-	/**#@+
-	  * Accessor and mutator
-	  */
-	function name( $x = null ) { return wfSetVar( $this->mName, $x ); }
-	function restrictions( $x = null) {
-		# Use the one below this
-		wfDeprecated( __METHOD__ );
-		return wfSetVar( $this->mRestriction, $x );
-	}
-	function restriction( $x = null) { return wfSetVar( $this->mRestriction, $x ); }
-	function listed( $x = null) { return wfSetVar( $this->mListed, $x ); }
-	function func( $x = null) { return wfSetVar( $this->mFunction, $x ); }
-	function file( $x = null) { return wfSetVar( $this->mFile, $x ); }
-	function includable( $x = null ) { return wfSetVar( $this->mIncludable, $x ); }
-	function including( $x = null ) { return wfSetVar( $this->mIncluding, $x ); }
-	/**#@-*/
+	/**
+	 * Get the name of this Special Page.
+	 * @return String
+	 */
+	function getName() {
+		return $this->mName;
+	}
+
+	/**
+	 * Get the permission that a user must have to execute this page
+	 * @return String
+	 */
+	function getRestriction() {
+		return $this->mRestriction;
+	}
+
+	/**
+	 * Get the file which will be included by SpecialPage::execute() if your extension is
+	 * still stuck in the past and hasn't overridden the execute() method.  No modern code
+	 * should want or need to know this.
+	 * @return String
+	 * @deprecated since 1.18
+	 */
+	function getFile() {
+		wfDeprecated( __METHOD__, '1.18' );
+		return $this->mFile;
+	}
+
+	// @todo FIXME: Decide which syntax to use for this, and stick to it
+	/**
+	 * Whether this special page is listed in Special:SpecialPages
+	 * @since r3583 (v1.3)
+	 * @return Bool
+	 */
+	function isListed() {
+		return $this->mListed;
+	}
+	/**
+	 * Set whether this page is listed in Special:Specialpages, at run-time
+	 * @since r3583 (v1.3)
+	 * @param $listed Bool
+	 * @return Bool
+	 */
+	function setListed( $listed ) {
+		return wfSetVar( $this->mListed, $listed );
+	}
+	/**
+	 * Get or set whether this special page is listed in Special:SpecialPages
+	 * @since r11308 (v1.6)
+	 * @param $x Bool
+	 * @return Bool
+	 */
+	function listed( $x = null ) {
+		return wfSetVar( $this->mListed, $x );
+	}
+
+	/**
+	 * Whether it's allowed to transclude the special page via {{Special:Foo/params}}
+	 * @return Bool
+	 */
+	public function isIncludable() {
+		return $this->mIncludable;
+	}
+
+	/**
+	 * These mutators are very evil, as the relevant variables should not mutate.  So
+	 * don't use them.
+	 * @param $x Mixed
+	 * @return Mixed
+	 * @deprecated since 1.18
+	 */
+	function name( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mName, $x ); }
+
+	/**
+	 * These mutators are very evil, as the relevant variables should not mutate.  So
+	 * don't use them.
+	 * @param $x Mixed
+	 * @return Mixed
+	 * @deprecated since 1.18
+	 */
+	function restriction( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mRestriction, $x ); }
+
+	/**
+	 * These mutators are very evil, as the relevant variables should not mutate.  So
+	 * don't use them.
+	 * @param $x Mixed
+	 * @return Mixed
+	 * @deprecated since 1.18
+	 */
+	function func( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mFunction, $x ); }
+
+	/**
+	 * These mutators are very evil, as the relevant variables should not mutate.  So
+	 * don't use them.
+	 * @param $x Mixed
+	 * @return Mixed
+	 * @deprecated since 1.18
+	 */
+	function file( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mFile, $x ); }
+
+	/**
+	 * These mutators are very evil, as the relevant variables should not mutate.  So
+	 * don't use them.
+	 * @param $x Mixed
+	 * @return Mixed
+	 * @deprecated since 1.18
+	 */
+	function includable( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mIncludable, $x ); }
+
+	/**
+	 * Whether the special page is being evaluated via transclusion
+	 * @param $x Bool
+	 * @return Bool
+	 */
+	function including( $x = null ) {
+		return wfSetVar( $this->mIncluding, $x );
+	}
 
 	/**
 	 * Get the localised name of the special page
 	 */
 	function getLocalName() {
 		if ( !isset( $this->mLocalName ) ) {
-			$this->mLocalName = self::getLocalNameFor( $this->mName );
+			$this->mLocalName = SpecialPageFactory::getLocalNameFor( $this->mName );
 		}
 		return $this->mLocalName;
 	}
@@ -842,7 +536,7 @@ class SpecialPage {
 	public function isRestricted() {
 		global $wgGroupPermissions;
 		// DWIM: If all anons can do something, then it is not restricted
-		return $this->mRestriction != '' && empty($wgGroupPermissions['*'][$this->mRestriction]);
+		return $this->mRestriction != '' && empty( $wgGroupPermissions['*'][$this->mRestriction] );
 	}
 
 	/**
@@ -853,7 +547,7 @@ class SpecialPage {
 	 * @param $user User: the user to check
 	 * @return Boolean: does the user have permission to view the page?
 	 */
-	public function userCanExecute( $user ) {
+	public function userCanExecute( User $user ) {
 		return $user->isAllowed( $this->mRestriction );
 	}
 
@@ -861,42 +555,61 @@ class SpecialPage {
 	 * Output an error message telling the user what access level they have to have
 	 */
 	function displayRestrictionError() {
-		global $wgOut;
-		$wgOut->permissionRequired( $this->mRestriction );
+		throw new PermissionsError( $this->mRestriction );
+	}
+
+	/**
+	 * Checks if userCanExecute, and if not throws a PermissionsError
+	 *
+	 * @since 1.19
+	 */
+	public function checkPermissions() {
+		if ( !$this->userCanExecute( $this->getUser() ) ) {
+			$this->displayRestrictionError();
+		}
+	}
+
+	/**
+	 * If the wiki is currently in readonly mode, throws a ReadOnlyError
+	 *
+	 * @since 1.19
+	 * @throws ReadOnlyError
+	 */
+	public function checkReadOnly() {
+		if ( wfReadOnly() ) {
+			throw new ReadOnlyError;
+		}
 	}
 
 	/**
 	 * Sets headers - this should be called from the execute() method of all derived classes!
 	 */
 	function setHeaders() {
-		global $wgOut;
-		$wgOut->setArticleRelated( false );
-		$wgOut->setRobotPolicy( "noindex,nofollow" );
-		$wgOut->setPageTitle( $this->getDescription() );
+		$out = $this->getOutput();
+		$out->setArticleRelated( false );
+		$out->setRobotPolicy( "noindex,nofollow" );
+		$out->setPageTitle( $this->getDescription() );
 	}
 
 	/**
 	 * Default execute method
 	 * Checks user permissions, calls the function given in mFunction
 	 *
-	 * This may be overridden by subclasses.
+	 * This must be overridden by subclasses; it will be made abstract in a future version
+	 *
+	 * @param $par String subpage string, if one was specified
 	 */
 	function execute( $par ) {
-		global $wgUser;
-
 		$this->setHeaders();
+		$this->checkPermissions();
 
-		if ( $this->userCanExecute( $wgUser ) ) {
-			$func = $this->mFunction;
-			// only load file if the function does not exist
-			if(!is_callable($func) and $this->mFile) {
-				require_once( $this->mFile );
-			}
-			$this->outputHeader();
-			call_user_func( $func, $par, $this );
-		} else {
-			$this->displayRestrictionError();
+		$func = $this->mFunction;
+		// only load file if the function does not exist
+		if ( !is_callable( $func ) && $this->mFile ) {
+			require_once( $this->mFile );
 		}
+		$this->outputHeader();
+		call_user_func( $func, $par, $this );
 	}
 
 	/**
@@ -908,15 +621,16 @@ class SpecialPage {
 	 * @param $summaryMessageKey String: message key of the summary
 	 */
 	function outputHeader( $summaryMessageKey = '' ) {
-		global $wgOut, $wgContLang;
+		global $wgContLang;
 
-		if( $summaryMessageKey == '' ) {
-			$msg = $wgContLang->lc( $this->name() ) . '-summary';
+		if ( $summaryMessageKey == '' ) {
+			$msg = $wgContLang->lc( $this->getName() ) . '-summary';
 		} else {
 			$msg = $summaryMessageKey;
 		}
-		if ( !wfMessage( $msg )->isBlank() and ! $this->including() ) {
-			$wgOut->wrapWikiMsg( "<div class='mw-specialpage-summary'>\n$1\n</div>", $msg );
+		if ( !$this->msg( $msg )->isBlank() && !$this->including() ) {
+			$this->getOutput()->wrapWikiMsg(
+				"<div class='mw-specialpage-summary'>\n$1\n</div>", $msg );
 		}
 
 	}
@@ -932,12 +646,13 @@ class SpecialPage {
 	 * @return String
 	 */
 	function getDescription() {
-		return wfMsg( strtolower( $this->mName ) );
+		return $this->msg( strtolower( $this->mName ) )->text();
 	}
 
 	/**
 	 * Get a self-referential title object
 	 *
+	 * @param $subpage String|Bool
 	 * @return Title object
 	 */
 	function getTitle( $subpage = false ) {
@@ -945,64 +660,262 @@ class SpecialPage {
 	}
 
 	/**
-	 * Set whether this page is listed in Special:Specialpages, at run-time
+	 * Sets the context this SpecialPage is executed in
+	 *
+	 * @param $context IContextSource
+	 * @since 1.18
 	 */
-	function setListed( $listed ) {
-		return wfSetVar( $this->mListed, $listed );
+	public function setContext( $context ) {
+		$this->mContext = $context;
 	}
 
 	/**
-	 * If the special page is a redirect, then get the Title object it redirects to.
-	 * False otherwise.
+	 * Gets the context this SpecialPage is executed in
+	 *
+	 * @return IContextSource
+	 * @since 1.18
 	 */
-	function getRedirect( $subpage ) {
-		return false;
+	public function getContext() {
+		if ( $this->mContext instanceof IContextSource ) {
+			return $this->mContext;
+		} else {
+			wfDebug( __METHOD__ . " called and \$mContext is null. Return RequestContext::getMain(); for sanity\n" );
+			return RequestContext::getMain();
+		}
 	}
 
 	/**
-	 * Return part of the request string for a special redirect page
-	 * This allows passing, e.g. action=history to Special:Mypage, etc.
+	 * Get the WebRequest being used for this instance
 	 *
-	 * @return String
+	 * @return WebRequest
+	 * @since 1.18
 	 */
-	function getRedirectQuery() {
-		global $wgRequest;
-		$params = array();
+	public function getRequest() {
+		return $this->getContext()->getRequest();
+	}
 
-		foreach( $this->mAllowedRedirectParams as $arg ) {
-			if( $wgRequest->getVal( $arg, null ) !== null ){
-				$params[$arg] = $wgRequest->getVal( $arg );
-			}
-		}
+	/**
+	 * Get the OutputPage being used for this instance
+	 *
+	 * @return OutputPage
+	 * @since 1.18
+	 */
+	public function getOutput() {
+		return $this->getContext()->getOutput();
+	}
 
-		foreach( $this->mAddedRedirectParams as $arg => $val ) {
-			$params[$arg] = $val;
-		}
+	/**
+	 * Shortcut to get the User executing this instance
+	 *
+	 * @return User
+	 * @since 1.18
+	 */
+	public function getUser() {
+		return $this->getContext()->getUser();
+	}
 
-		return count( $params )
-			? $params
-			: false;
+	/**
+	 * Shortcut to get the skin being used for this instance
+	 *
+	 * @return Skin
+	 * @since 1.18
+	 */
+	public function getSkin() {
+		return $this->getContext()->getSkin();
 	}
-	
+
 	/**
-	 * Sets the context this SpecialPage is executed in
-	 * 
-	 * @param $request WebRequest
-	 * @param $output OutputPage
+	 * Shortcut to get user's language
+	 *
+	 * @deprecated 1.19 Use getLanguage instead
+	 * @return Language
+	 * @since 1.18
 	 */
-	protected function setContext( $request, $output ) {
-		$this->mRequest = $request;
-		$this->mOutput = $output;
-		$this->mFullTitle = $output->getTitle();
+	public function getLang() {
+		wfDeprecated( __METHOD__, '1.19' );
+		return $this->getLanguage();
 	}
+
 	/**
-	 * Wrapper around wfMessage that sets the current context. Currently this
-	 * is only the title.
-	 * 
+	 * Shortcut to get user's language
+	 *
+	 * @return Language
+	 * @since 1.19
+	 */
+	public function getLanguage() {
+		return $this->getContext()->getLanguage();
+	}
+
+	/**
+	 * Return the full title, including $par
+	 *
+	 * @return Title
+	 * @since 1.18
+	 */
+	public function getFullTitle() {
+		return $this->getContext()->getTitle();
+	}
+
+	/**
+	 * Wrapper around wfMessage that sets the current context.
+	 *
+	 * @return Message
 	 * @see wfMessage
 	 */
 	public function msg( /* $args */ ) {
-		return call_user_func_array( 'wfMessage', func_get_args() )->title( $this->mFullTitle );
+		// Note: can't use func_get_args() directly as second or later item in
+		// a parameter list until PHP 5.3 or you get a fatal error.
+		// Works fine as the first parameter, which appears elsewhere in the
+		// code base. Sighhhh.
+		$args = func_get_args();
+		return call_user_func_array( array( $this->getContext(), 'msg' ), $args );
+	}
+
+	/**
+	 * Adds RSS/atom links
+	 *
+	 * @param $params array
+	 */
+	protected function addFeedLinks( $params ) {
+		global $wgFeedClasses;
+
+		$feedTemplate = wfScript( 'api' ) . '?';
+
+		foreach ( $wgFeedClasses as $format => $class ) {
+			$theseParams = $params + array( 'feedformat' => $format );
+			$url = $feedTemplate . wfArrayToCGI( $theseParams );
+			$this->getOutput()->addFeedLink( $format, $url );
+		}
+	}
+}
+
+/**
+ * Special page which uses an HTMLForm to handle processing.  This is mostly a
+ * clone of FormAction.  More special pages should be built this way; maybe this could be
+ * a new structure for SpecialPages
+ */
+abstract class FormSpecialPage extends SpecialPage {
+
+	/**
+	 * Get an HTMLForm descriptor array
+	 * @return Array
+	 */
+	protected abstract function getFormFields();
+
+	/**
+	 * Add pre- or post-text to the form
+	 * @return String HTML which will be sent to $form->addPreText()
+	 */
+	protected function preText() { return ''; }
+	protected function postText() { return ''; }
+
+	/**
+	 * Play with the HTMLForm if you need to more substantially
+	 * @param $form HTMLForm
+	 */
+	protected function alterForm( HTMLForm $form ) {}
+
+	/**
+	 * Get the HTMLForm to control behaviour
+	 * @return HTMLForm|null
+	 */
+	protected function getForm() {
+		$this->fields = $this->getFormFields();
+
+		$form = new HTMLForm( $this->fields, $this->getContext() );
+		$form->setSubmitCallback( array( $this, 'onSubmit' ) );
+		$form->setWrapperLegend( $this->msg( strtolower( $this->getName() ) . '-legend' ) );
+		$form->addHeaderText(
+			$this->msg( strtolower( $this->getName() ) . '-text' )->parseAsBlock() );
+
+		// Retain query parameters (uselang etc)
+		$params = array_diff_key(
+			$this->getRequest()->getQueryValues(), array( 'title' => null ) );
+		$form->addHiddenField( 'redirectparams', wfArrayToCGI( $params ) );
+
+		$form->addPreText( $this->preText() );
+		$form->addPostText( $this->postText() );
+		$this->alterForm( $form );
+
+		// Give hooks a chance to alter the form, adding extra fields or text etc
+		wfRunHooks( "Special{$this->getName()}BeforeFormDisplay", array( &$form ) );
+
+		return $form;
+	}
+
+	/**
+	 * Process the form on POST submission.
+	 * @param  $data Array
+	 * @return Bool|Array true for success, false for didn't-try, array of errors on failure
+	 */
+	public abstract function onSubmit( array $data );
+
+	/**
+	 * Do something exciting on successful processing of the form, most likely to show a
+	 * confirmation message
+	 */
+	public abstract function onSuccess();
+
+	/**
+	 * Basic SpecialPage workflow: get a form, send it to the user; get some data back,
+	 *
+	 * @param $par String Subpage string if one was specified
+	 */
+	public function execute( $par ) {
+		$this->setParameter( $par );
+		$this->setHeaders();
+
+		// This will throw exceptions if there's a problem
+		$this->checkExecutePermissions( $this->getUser() );
+
+		$form = $this->getForm();
+		if ( $form->show() ) {
+			$this->onSuccess();
+		}
+	}
+
+	/**
+	 * Maybe do something interesting with the subpage parameter
+	 * @param $par String
+	 */
+	protected function setParameter( $par ) {}
+
+	/**
+	 * Called from execute() to check if the given user can perform this action.
+	 * Failures here must throw subclasses of ErrorPageError.
+	 * @param $user User
+	 * @return Bool true
+	 * @throws ErrorPageError
+	 */
+	protected function checkExecutePermissions( User $user ) {
+		$this->checkPermissions();
+
+		if ( $this->requiresUnblock() && $user->isBlocked() ) {
+			$block = $user->mBlock;
+			throw new UserBlockedError( $block );
+		}
+
+		if ( $this->requiresWrite() ) {
+			$this->checkReadOnly();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Whether this action requires the wiki not to be locked
+	 * @return Bool
+	 */
+	public function requiresWrite() {
+		return true;
+	}
+
+	/**
+	 * Whether this action cannot be executed by a blocked user
+	 * @return Bool
+	 */
+	public function requiresUnblock() {
+		return true;
 	}
 }
 
@@ -1010,32 +923,107 @@ class SpecialPage {
  * Shortcut to construct a special page which is unlisted by default
  * @ingroup SpecialPage
  */
-class UnlistedSpecialPage extends SpecialPage
-{
+class UnlistedSpecialPage extends SpecialPage {
 	function __construct( $name, $restriction = '', $function = false, $file = 'default' ) {
 		parent::__construct( $name, $restriction, false, $function, $file );
 	}
+
+	public function isListed() {
+		return false;
+	}
 }
 
 /**
  * Shortcut to construct an includable special  page
  * @ingroup SpecialPage
  */
-class IncludableSpecialPage extends SpecialPage
-{
-	function __construct( $name, $restriction = '', $listed = true, $function = false, $file = 'default' ) {
+class IncludableSpecialPage extends SpecialPage {
+	function __construct(
+		$name, $restriction = '', $listed = true, $function = false, $file = 'default'
+	) {
 		parent::__construct( $name, $restriction, $listed, $function, $file, true );
 	}
+
+	public function isIncludable() {
+		return true;
+	}
 }
 
 /**
  * Shortcut to construct a special page alias.
  * @ingroup SpecialPage
  */
-class SpecialRedirectToSpecial extends UnlistedSpecialPage {
+abstract class RedirectSpecialPage extends UnlistedSpecialPage {
+
+	// Query parameters that can be passed through redirects
+	protected $mAllowedRedirectParams = array();
+
+	// Query parameteres added by redirects
+	protected $mAddedRedirectParams = array();
+
+	public function execute( $par ) {
+		$redirect = $this->getRedirect( $par );
+		$query = $this->getRedirectQuery();
+		// Redirect to a page title with possible query parameters
+		if ( $redirect instanceof Title ) {
+			$url = $redirect->getFullUrl( $query );
+			$this->getOutput()->redirect( $url );
+			wfProfileOut( __METHOD__ );
+			return $redirect;
+		// Redirect to index.php with query parameters
+		} elseif ( $redirect === true ) {
+			global $wgScript;
+			$url = $wgScript . '?' . wfArrayToCGI( $query );
+			$this->getOutput()->redirect( $url );
+			wfProfileOut( __METHOD__ );
+			return $redirect;
+		} else {
+			$class = __CLASS__;
+			throw new MWException( "RedirectSpecialPage $class doesn't redirect!" );
+		}
+	}
+
+	/**
+	 * If the special page is a redirect, then get the Title object it redirects to.
+	 * False otherwise.
+	 *
+	 * @param $par String Subpage string
+	 * @return Title|false
+	 */
+	abstract public function getRedirect( $par );
+
+	/**
+	 * Return part of the request string for a special redirect page
+	 * This allows passing, e.g. action=history to Special:Mypage, etc.
+	 *
+	 * @return String
+	 */
+	public function getRedirectQuery() {
+		$params = array();
+
+		foreach ( $this->mAllowedRedirectParams as $arg ) {
+			if ( $this->getRequest()->getVal( $arg, null ) !== null ) {
+				$params[$arg] = $this->getRequest()->getVal( $arg );
+			}
+		}
+
+		foreach ( $this->mAddedRedirectParams as $arg => $val ) {
+			$params[$arg] = $val;
+		}
+
+		return count( $params )
+			? $params
+			: false;
+	}
+}
+
+abstract class SpecialRedirectToSpecial extends RedirectSpecialPage {
 	var $redirName, $redirSubpage;
 
-	function __construct( $name, $redirName, $redirSubpage = false, $allowedRedirectParams = array(), $addedRedirectParams = array() ) {
+	function __construct(
+		$name, $redirName, $redirSubpage = false,
+		$allowedRedirectParams = array(), $addedRedirectParams = array()
+	) {
 		parent::__construct( $name );
 		$this->redirName = $redirName;
 		$this->redirSubpage = $redirSubpage;
@@ -1043,7 +1031,7 @@ class SpecialRedirectToSpecial extends UnlistedSpecialPage {
 		$this->mAddedRedirectParams = $addedRedirectParams;
 	}
 
-	function getRedirect( $subpage ) {
+	public function getRedirect( $subpage ) {
 		if ( $this->redirSubpage === false ) {
 			return SpecialPage::getTitleFor( $this->redirName, $subpage );
 		} else {
@@ -1052,6 +1040,33 @@ class SpecialRedirectToSpecial extends UnlistedSpecialPage {
 	}
 }
 
+/**
+ * ListAdmins --> ListUsers/sysop
+ */
+class SpecialListAdmins extends SpecialRedirectToSpecial {
+	function __construct() {
+		parent::__construct( 'Listadmins', 'Listusers', 'sysop' );
+	}
+}
+
+/**
+ * ListBots --> ListUsers/bot
+ */
+class SpecialListBots extends SpecialRedirectToSpecial {
+	function __construct() {
+		parent::__construct( 'Listbots', 'Listusers', 'bot' );
+	}
+}
+
+/**
+ * CreateAccount --> UserLogin/signup
+ * @todo FIXME: This (and the rest of the login frontend) needs to die a horrible painful death
+ */
+class SpecialCreateAccount extends SpecialRedirectToSpecial {
+	function __construct() {
+		parent::__construct( 'CreateAccount', 'Userlogin', 'signup', array( 'uselang' ) );
+	}
+}
 /**
  * SpecialMypage, SpecialMytalk and SpecialMycontributions special pages
  * are used to get user independant links pointing to the user page, talk
@@ -1064,19 +1079,20 @@ class SpecialRedirectToSpecial extends UnlistedSpecialPage {
  * Shortcut to construct a special page pointing to current user user's page.
  * @ingroup SpecialPage
  */
-class SpecialMypage extends UnlistedSpecialPage {
+class SpecialMypage extends RedirectSpecialPage {
 	function __construct() {
 		parent::__construct( 'Mypage' );
 		$this->mAllowedRedirectParams = array( 'action' , 'preload' , 'editintro',
-			'section', 'oldid', 'diff', 'dir' );
+			'section', 'oldid', 'diff', 'dir',
+			// Options for action=raw; missing ctype can break JS or CSS in some browsers
+			'ctype', 'maxage', 'smaxage' );
 	}
 
 	function getRedirect( $subpage ) {
-		global $wgUser;
 		if ( strval( $subpage ) !== '' ) {
-			return Title::makeTitle( NS_USER, $wgUser->getName() . '/' . $subpage );
+			return Title::makeTitle( NS_USER, $this->getUser()->getName() . '/' . $subpage );
 		} else {
-			return Title::makeTitle( NS_USER, $wgUser->getName() );
+			return Title::makeTitle( NS_USER, $this->getUser()->getName() );
 		}
 	}
 }
@@ -1085,7 +1101,7 @@ class SpecialMypage extends UnlistedSpecialPage {
  * Shortcut to construct a special page pointing to current user talk page.
  * @ingroup SpecialPage
  */
-class SpecialMytalk extends UnlistedSpecialPage {
+class SpecialMytalk extends RedirectSpecialPage {
 	function __construct() {
 		parent::__construct( 'Mytalk' );
 		$this->mAllowedRedirectParams = array( 'action' , 'preload' , 'editintro',
@@ -1093,11 +1109,10 @@ class SpecialMytalk extends UnlistedSpecialPage {
 	}
 
 	function getRedirect( $subpage ) {
-		global $wgUser;
 		if ( strval( $subpage ) !== '' ) {
-			return Title::makeTitle( NS_USER_TALK, $wgUser->getName() . '/' . $subpage );
+			return Title::makeTitle( NS_USER_TALK, $this->getUser()->getName() . '/' . $subpage );
 		} else {
-			return Title::makeTitle( NS_USER_TALK, $wgUser->getName() );
+			return Title::makeTitle( NS_USER_TALK, $this->getUser()->getName() );
 		}
 	}
 }
@@ -1106,7 +1121,7 @@ class SpecialMytalk extends UnlistedSpecialPage {
  * Shortcut to construct a special page pointing to current user contributions.
  * @ingroup SpecialPage
  */
-class SpecialMycontributions extends UnlistedSpecialPage {
+class SpecialMycontributions extends RedirectSpecialPage {
 	function __construct() {
 		parent::__construct(  'Mycontributions' );
 		$this->mAllowedRedirectParams = array( 'limit', 'namespace', 'tagfilter',
@@ -1114,30 +1129,28 @@ class SpecialMycontributions extends UnlistedSpecialPage {
 	}
 
 	function getRedirect( $subpage ) {
-		global $wgUser;
-		return SpecialPage::getTitleFor( 'Contributions', $wgUser->getName() );
+		return SpecialPage::getTitleFor( 'Contributions', $this->getUser()->getName() );
 	}
 }
 
 /**
  * Redirect to Special:Listfiles?user=$wgUser
  */
-class SpecialMyuploads extends UnlistedSpecialPage {
+class SpecialMyuploads extends RedirectSpecialPage {
 	function __construct() {
 		parent::__construct( 'Myuploads' );
 		$this->mAllowedRedirectParams = array( 'limit' );
 	}
 
 	function getRedirect( $subpage ) {
-		global $wgUser;
-		return SpecialPage::getTitleFor( 'Listfiles', $wgUser->getName() );
+		return SpecialPage::getTitleFor( 'Listfiles', $this->getUser()->getName() );
 	}
 }
 
 /**
  * Redirect from Special:PermanentLink/### to index.php?oldid=###
  */
-class SpecialPermanentLink extends UnlistedSpecialPage {
+class SpecialPermanentLink extends RedirectSpecialPage {
 	function __construct() {
 		parent::__construct( 'PermanentLink' );
 		$this->mAllowedRedirectParams = array();
@@ -1145,6 +1158,10 @@ class SpecialPermanentLink extends UnlistedSpecialPage {
 
 	function getRedirect( $subpage ) {
 		$subpage = intval( $subpage );
+		if ( $subpage === 0 ) {
+			# throw an error page when no subpage was given
+			throw new ErrorPageError( 'nopagetitle', 'nopagetext' );
+		}
 		$this->mAddedRedirectParams['oldid'] = $subpage;
 		return true;
 	}