Update to MediaWiki 1.19.0

1 files changed, 179 insertions, 138 deletions

diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index f1fe8386..7d93cc75 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -27,8 +27,7 @@
  *
  * @ingroup SpecialPage
  */
-class SpecialBlock extends SpecialPage {
-
+class SpecialBlock extends FormSpecialPage {
 	/** The maximum number of edits a user can have and still be hidden
 	 * TODO: config setting? */
 	const HIDEUSER_CONTRIBLIMIT = 1000;
@@ -56,65 +55,66 @@ class SpecialBlock extends SpecialPage {
 		parent::__construct( 'Block', 'block' );
 	}
 
-	public function execute( $par ) {
-		global $wgUser, $wgOut, $wgRequest;
-
-		# Permission check
-		if( !$this->userCanExecute( $wgUser ) ) {
-			$this->displayRestrictionError();
-			return;
-		}
+	/**
+	 * Checks that the user can unblock themselves if they are trying to do so
+	 *
+	 * @param User $user
+	 * @throws ErrorPageError
+	 */
+	protected function checkExecutePermissions( User $user ) {
+		 parent::checkExecutePermissions( $user );
 
-		# Can't block when the database is locked
-		if( wfReadOnly() ) {
-			throw new ReadOnlyError;
+		# bug 15810: blocked admins should have limited access here
+		$status = self::checkUnblockSelf( $this->target, $user );
+		if ( $status !== true ) {
+			throw new ErrorPageError( 'badaccess', $status );
 		}
+	}
 
+	/**
+	 * Handle some magic here
+	 *
+	 * @param $par String
+	 */
+	protected function setParameter( $par ) {
 		# Extract variables from the request.  Try not to get into a situation where we
 		# need to extract *every* variable from the form just for processing here, but
 		# there are legitimate uses for some variables
-		list( $this->target, $this->type ) = self::getTargetAndType( $par, $wgRequest );
+		$request = $this->getRequest();
+		list( $this->target, $this->type ) = self::getTargetAndType( $par, $request );
 		if ( $this->target instanceof User ) {
 			# Set the 'relevant user' in the skin, so it displays links like Contributions,
 			# User logs, UserRights, etc.
 			$this->getSkin()->setRelevantUser( $this->target );
 		}
 
-		list( $this->previousTarget, /*...*/ ) = Block::parseTarget( $wgRequest->getVal( 'wpPreviousTarget' ) );
-		$this->requestedHideUser = $wgRequest->getBool( 'wpHideUser' );
-
-		# bug 15810: blocked admins should have limited access here
-		$status = self::checkUnblockSelf( $this->target );
-		if ( $status !== true ) {
-			throw new ErrorPageError( 'badaccess', $status );
-		}
-
-		$wgOut->setPageTitle( wfMsg( 'blockip-title' ) );
-		$wgOut->addModules( 'mediawiki.special', 'mediawiki.special.block' );
-
-		$out = $this->getOutput();
-		$out->setPageTitle( wfMsg( 'blockip-title' ) );
-		$out->addModules( array( 'mediawiki.special', 'mediawiki.special.block' ) );
-
-		$fields = $this->getFormFields();
-		$this->maybeAlterFormDefaults( $fields );
-
-		$form = new HTMLForm( $fields, $this->getContext() );
-		$form->setWrapperLegend( wfMsg( 'blockip-legend' ) );
-		$form->setSubmitCallback( array( __CLASS__, 'processForm' ) );
+		list( $this->previousTarget, /*...*/ ) = Block::parseTarget( $request->getVal( 'wpPreviousTarget' ) );
+		$this->requestedHideUser = $request->getBool( 'wpHideUser' );
+	}
 
-		$t = $this->alreadyBlocked
-			? wfMsg( 'ipb-change-block' )
-			: wfMsg( 'ipbsubmit' );
-		$form->setSubmitText( $t );
+	/**
+	 * Customizes the HTMLForm a bit
+	 *
+	 * @param $form HTMLForm
+	 */
+	protected function alterForm( HTMLForm $form ) {
+		$form->setWrapperLegendMsg( 'blockip-legend' );
+		$form->setHeaderText( '' );
+		$form->setSubmitCallback( array( __CLASS__, 'processUIForm' ) );
 
-		$this->doPreText( $form );
-		$this->doHeadertext( $form );
-		$this->doPostText( $form );
+		$msg = $this->alreadyBlocked ? 'ipb-change-block' : 'ipbsubmit';
+		$form->setSubmitTextMsg( $msg );
 
-		if( $form->show() ){
-			$wgOut->setPageTitle( wfMsg( 'blockipsuccesssub' ) );
-			$wgOut->addWikiMsg( 'blockipsuccesstext',  $this->target );
+		# Don't need to do anything if the form has been posted
+		if( !$this->getRequest()->wasPosted() && $this->preErrors ){
+			$s = HTMLForm::formatErrors( $this->preErrors );
+			if( $s ){
+				$form->addHeaderText( Html::rawElement(
+						'div',
+						array( 'class' => 'error' ),
+						$s
+					) );
+			}
 		}
 	}
 
@@ -122,8 +122,10 @@ class SpecialBlock extends SpecialPage {
 	 * Get the HTMLForm descriptor array for the block form
 	 * @return Array
 	 */
-	protected static function getFormFields(){
-		global $wgUser, $wgBlockAllowsUTEdit;
+	protected function getFormFields(){
+		global $wgBlockAllowsUTEdit;
+
+		$user = $this->getUser();
 
 		$a = array(
 			'Target' => array(
@@ -141,7 +143,7 @@ class SpecialBlock extends SpecialPage {
 				'required' => true,
 				'tabindex' => '2',
 				'options' => self::getSuggestedDurations(),
-				'other' => wfMsg( 'ipbother' ),
+				'other' => $this->msg( 'ipbother' )->text(),
 			),
 			'Reason' => array(
 				'type' => 'selectandother',
@@ -155,7 +157,7 @@ class SpecialBlock extends SpecialPage {
 			),
 		);
 
-		if( self::canBlockEmail( $wgUser ) ) {
+		if( self::canBlockEmail( $user ) ) {
 			$a['DisableEmail'] = array(
 				'type' => 'check',
 				'label-message' => 'ipbemailban',
@@ -177,7 +179,7 @@ class SpecialBlock extends SpecialPage {
 		);
 
 		# Allow some users to hide name from block log, blocklist and listusers
-		if( $wgUser->isAllowed( 'hideuser' ) ) {
+		if( $user->isAllowed( 'hideuser' ) ) {
 			$a['HideUser'] = array(
 				'type' => 'check',
 				'label-message' => 'ipbhidename',
@@ -186,7 +188,7 @@ class SpecialBlock extends SpecialPage {
 		}
 
 		# Watchlist their user page? (Only if user is logged in)
-		if( $wgUser->isLoggedIn() ) {
+		if( $user->isLoggedIn() ) {
 			$a['Watch'] = array(
 				'type' => 'check',
 				'label-message' => 'ipbwatchuser',
@@ -213,19 +215,19 @@ class SpecialBlock extends SpecialPage {
 			'label-message' => 'ipb-confirm',
 		);
 
+		$this->maybeAlterFormDefaults( $a );
+
 		return $a;
 	}
 
 	/**
 	 * If the user has already been blocked with similar settings, load that block
 	 * and change the defaults for the form fields to match the existing settings.
-	 * @param &$fields Array HTMLForm descriptor array
+	 * @param $fields Array HTMLForm descriptor array
 	 * @return Bool whether fields were altered (that is, whether the target is
 	 *     already blocked)
 	 */
 	protected function maybeAlterFormDefaults( &$fields ){
-		global $wgRequest, $wgUser;
-
 		# This will be overwritten by request data
 		$fields['Target']['default'] = (string)$this->target;
 
@@ -242,18 +244,22 @@ class SpecialBlock extends SpecialPage {
 			$fields['HardBlock']['default'] = $block->isHardblock();
 			$fields['CreateAccount']['default'] = $block->prevents( 'createaccount' );
 			$fields['AutoBlock']['default'] = $block->isAutoblocking();
+
 			if( isset( $fields['DisableEmail'] ) ){
 				$fields['DisableEmail']['default'] = $block->prevents( 'sendemail' );
 			}
+
 			if( isset( $fields['HideUser'] ) ){
 				$fields['HideUser']['default'] = $block->mHideName;
 			}
+
 			if( isset( $fields['DisableUTEdit'] ) ){
 				$fields['DisableUTEdit']['default'] = $block->prevents( 'editownusertalk' );
 			}
+
 			$fields['Reason']['default'] = $block->mReason;
 
-			if( $wgRequest->wasPosted() ){
+			if( $this->getRequest()->wasPosted() ){
 				# Ok, so we got a POST submission asking us to reblock a user.  So show the
 				# confirm checkbox; the user will only see it if they haven't previously
 				$fields['Confirm']['type'] = 'check';
@@ -282,7 +288,7 @@ class SpecialBlock extends SpecialPage {
 		}
 
 		# Or if the user is trying to block themselves
-		if( (string)$this->target === $wgUser->getName() ){
+		if( (string)$this->target === $this->getUser()->getName() ){
 			$fields['Confirm']['type'] = 'check';
 			unset( $fields['Confirm']['default'] );
 			$this->preErrors[] = 'ipb-blockingself';
@@ -291,11 +297,9 @@ class SpecialBlock extends SpecialPage {
 
 	/**
 	 * Add header elements like block log entries, etc.
-	 * @param  $form HTMLForm
-	 * @return void
 	 */
-	protected function doPreText( HTMLForm &$form ){
-		$form->addPreText( wfMsgExt( 'blockiptext', 'parse' ) );
+	protected function preText(){
+		$text = $this->msg( 'blockiptext' )->parse();
 
 		$otherBlockMessages = array();
 		if( $this->target !== null ) {
@@ -306,65 +310,48 @@ class SpecialBlock extends SpecialPage {
 				$s = Html::rawElement(
 					'h2',
 					array(),
-					wfMsgExt( 'ipb-otherblocks-header', 'parseinline', count( $otherBlockMessages ) )
+					$this->msg( 'ipb-otherblocks-header', count( $otherBlockMessages ) )->parse()
 				) . "\n";
+
 				$list = '';
+
 				foreach( $otherBlockMessages as $link ) {
 					$list .= Html::rawElement( 'li', array(), $link ) . "\n";
 				}
+
 				$s .= Html::rawElement(
 					'ul',
 					array( 'class' => 'mw-blockip-alreadyblocked' ),
 					$list
 				) . "\n";
-				$form->addPreText( $s );
-			}
-		}
-	}
 
-	/**
-	 * Add header text inside the form, just underneath where the errors would go
-	 * @param $form HTMLForm
-	 * @return void
-	 */
-	protected function doHeaderText( HTMLForm &$form ){
-		global $wgRequest;
-		# Don't need to do anything if the form has been posted
-		if( !$wgRequest->wasPosted() && $this->preErrors ){
-			$s = HTMLForm::formatErrors( $this->preErrors );
-			if( $s ){
-				$form->addHeaderText( Html::rawElement(
-					'div',
-					array( 'class' => 'error' ),
-					$s
-				) );
+				$text .= $s;
 			}
 		}
+
+		return $text;
 	}
 
 	/**
 	 * Add footer elements to the form
-	 * @param  $form HTMLForm
-	 * @return void
+	 * @return string
 	 */
-	protected function doPostText( HTMLForm &$form ){
-		global $wgUser, $wgLang;
-
+	protected function postText(){
 		# Link to the user's contributions, if applicable
 		if( $this->target instanceof User ){
 			$contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->target->getName() );
 			$links[] = Linker::link(
 				$contribsPage,
-				wfMsgExt( 'ipb-blocklist-contribs', 'escape', $this->target->getName() )
+				$this->msg( 'ipb-blocklist-contribs', $this->target->getName() )->escaped()
 			);
 		}
 
 		# Link to unblock the specified user, or to a blank unblock form
 		if( $this->target instanceof User ) {
-			$message = wfMsgExt( 'ipb-unblock-addr', array( 'parseinline' ), $this->target->getName() );
+			$message = $this->msg( 'ipb-unblock-addr', $this->target->getName() )->parse();
 			$list = SpecialPage::getTitleFor( 'Unblock', $this->target->getName() );
 		} else {
-			$message = wfMsgExt( 'ipb-unblock', array( 'parseinline' ) );
+			$message = $this->msg( 'ipb-unblock' )->parse();
 			$list = SpecialPage::getTitleFor( 'Unblock' );
 		}
 		$links[] = Linker::linkKnown( $list, $message, array() );
@@ -372,24 +359,26 @@ class SpecialBlock extends SpecialPage {
 		# Link to the block list
 		$links[] = Linker::linkKnown(
 			SpecialPage::getTitleFor( 'BlockList' ),
-			wfMsg( 'ipb-blocklist' )
+			$this->msg( 'ipb-blocklist' )->escaped()
 		);
 
+		$user = $this->getUser();
+
 		# Link to edit the block dropdown reasons, if applicable
-		if ( $wgUser->isAllowed( 'editinterface' ) ) {
+		if ( $user->isAllowed( 'editinterface' ) ) {
 			$links[] = Linker::link(
 				Title::makeTitle( NS_MEDIAWIKI, 'Ipbreason-dropdown' ),
-				wfMsgHtml( 'ipb-edit-dropdown' ),
+				$this->msg( 'ipb-edit-dropdown' )->escaped(),
 				array(),
 				array( 'action' => 'edit' )
 			);
 		}
 
-		$form->addPostText( Html::rawElement(
+		$text =  Html::rawElement(
 			'p',
 			array( 'class' => 'mw-ipb-conveniencelinks' ),
-			$wgLang->pipeList( $links )
-		) );
+			$this->getLanguage()->pipeList( $links )
+		);
 
 		if( $this->target instanceof User ){
 			# Get relevant extracts from the block and suppression logs, if possible
@@ -399,7 +388,7 @@ class SpecialBlock extends SpecialPage {
 			LogEventsList::showLogExtract(
 				$out,
 				'block',
-				$userpage->getPrefixedText(),
+				$userpage,
 				'',
 				array(
 					'lim' => 10,
@@ -407,14 +396,14 @@ class SpecialBlock extends SpecialPage {
 					'showIfEmpty' => false
 				)
 			);
-			$form->addPostText( $out );
+			$text .= $out;
 
 			# Add suppression block entries if allowed
-			if( $wgUser->isAllowed( 'suppressionlog' ) ) {
+			if( $user->isAllowed( 'suppressionlog' ) ) {
 				LogEventsList::showLogExtract(
 					$out,
 					'suppress',
-					$userpage->getPrefixedText(),
+					$userpage,
 					'',
 					array(
 						'lim' => 10,
@@ -423,9 +412,12 @@ class SpecialBlock extends SpecialPage {
 						'showIfEmpty' => false
 					)
 				);
-				$form->addPostText( $out );
+
+				$text .= $out;
 			}
 		}
+
+		return $text;
 	}
 
 	/**
@@ -434,11 +426,12 @@ class SpecialBlock extends SpecialPage {
 	 * @param $par String subpage parameter passed to setup, or data value from
 	 *     the HTMLForm
 	 * @param $request WebRequest optionally try and get data from a request too
-	 * @return void
+	 * @return array( User|string|null, Block::TYPE_ constant|null )
 	 */
 	public static function getTargetAndType( $par, WebRequest $request = null ){
 		$i = 0;
 		$target = null;
+
 		while( true ){
 			switch( $i++ ){
 				case 0:
@@ -467,11 +460,14 @@ class SpecialBlock extends SpecialPage {
 				case 4:
 					break 2;
 			}
+
 			list( $target, $type ) = Block::parseTarget( $target );
+
 			if( $type !== null ){
 				return array( $target, $type );
 			}
 		}
+
 		return array( null, null );
 	}
 
@@ -480,9 +476,10 @@ class SpecialBlock extends SpecialPage {
 	 * @since 1.18
 	 * @param $value String
 	 * @param $alldata Array
+	 * @param $form HTMLForm
 	 * @return Message
 	 */
-	public static function validateTargetField( $value, $alldata = null ) {
+	public static function validateTargetField( $value, $alldata, $form ) {
 		global $wgBlockCIDRLimit;
 
 		list( $target, $type ) = self::getTargetAndType( $value );
@@ -490,13 +487,13 @@ class SpecialBlock extends SpecialPage {
 		if( $type == Block::TYPE_USER ){
 			# TODO: why do we not have a User->exists() method?
 			if( !$target->getId() ){
-				return wfMessage( 'nosuchusershort',
+				return $form->msg( 'nosuchusershort',
 					wfEscapeWikiText( $target->getName() ) );
 			}
 
-			$status = self::checkUnblockSelf( $target );
+			$status = self::checkUnblockSelf( $target, $form->getUser() );
 			if ( $status !== true ) {
-				return wfMessage( 'badaccess', $status );
+				return $form->msg( 'badaccess', $status );
 			}
 
 		} elseif( $type == Block::TYPE_RANGE ){
@@ -506,41 +503,52 @@ class SpecialBlock extends SpecialPage {
 				|| ( IP::isIPv6( $ip ) && $wgBlockCIDRLimit['IPv6'] == 128 ) )
 			{
 				# Range block effectively disabled
-				return wfMessage( 'range_block_disabled' );
+				return $form->msg( 'range_block_disabled' );
 			}
 
 			if( ( IP::isIPv4( $ip ) && $range > 32 )
 				|| ( IP::isIPv6( $ip ) && $range > 128 ) )
 			{
 				# Dodgy range
-				return wfMessage( 'ip_range_invalid' );
+				return $form->msg( 'ip_range_invalid' );
 			}
 
 			if( IP::isIPv4( $ip ) && $range < $wgBlockCIDRLimit['IPv4'] ) {
-				return wfMessage( 'ip_range_toolarge', $wgBlockCIDRLimit['IPv4'] );
+				return $form->msg( 'ip_range_toolarge', $wgBlockCIDRLimit['IPv4'] );
 			}
 
 			if( IP::isIPv6( $ip ) && $range < $wgBlockCIDRLimit['IPv6'] ) {
-				return wfMessage( 'ip_range_toolarge', $wgBlockCIDRLimit['IPv6'] );
+				return $form->msg( 'ip_range_toolarge', $wgBlockCIDRLimit['IPv6'] );
 			}
-
 		} elseif( $type == Block::TYPE_IP ){
 			# All is well
-
 		} else {
-			return wfMessage( 'badipaddress' );
+			return $form->msg( 'badipaddress' );
 		}
 
 		return true;
 	}
 
 	/**
+	 * Submit callback for an HTMLForm object, will simply pass
+	 * @param $data array
+	 * @param $form HTMLForm
+	 * @return Bool|String
+	 */
+	public static function processUIForm( array $data, HTMLForm $form ) {
+		return self::processForm( $data, $form->getContext() );
+	}
+
+	/**
 	 * Given the form data, actually implement a block
 	 * @param  $data Array
+	 * @param  $context IContextSource
 	 * @return Bool|String
 	 */
-	public static function processForm( array $data ){
-		global $wgUser, $wgBlockAllowsUTEdit;
+	public static function processForm( array $data, IContextSource $context ){
+		global $wgBlockAllowsUTEdit;
+
+		$performer = $context->getUser();
 
 		// Handled by field validator callback
 		// self::validateTargetField( $data['Target'] );
@@ -557,20 +565,21 @@ class SpecialBlock extends SpecialPage {
 
 			# Give admins a heads-up before they go and block themselves.  Much messier
 			# to do this for IPs, but it's pretty unlikely they'd ever get the 'block'
-			# permission anyway, although the code does allow for it
-			if( $target === $wgUser->getName() &&
-				( $data['PreviousTarget'] !== $data['Target'] || !$data['Confirm'] ) )
+			# permission anyway, although the code does allow for it.
+			# Note: Important to use $target instead of $data['Target']
+			# since both $data['PreviousTarget'] and $target are normalized
+			# but $data['target'] gets overriden by (non-normalized) request variable
+			# from previous request.
+			if( $target === $performer->getName() &&
+				( $data['PreviousTarget'] !== $target || !$data['Confirm'] ) )
 			{
 				return array( 'ipb-blockingself' );
 			}
-
 		} elseif( $type == Block::TYPE_RANGE ){
 			$userId = 0;
-
 		} elseif( $type == Block::TYPE_IP ){
 			$target = $target->getName();
 			$userId = 0;
-
 		} else {
 			# This should have been caught in the form field validation
 			return array( 'badipaddress' );
@@ -591,8 +600,9 @@ class SpecialBlock extends SpecialPage {
 		if( !isset( $data['HideUser'] ) ){
 			$data['HideUser'] = false;
 		}
+
 		if( $data['HideUser'] ) {
-			if( !$wgUser->isAllowed('hideuser') ){
+			if( !$performer->isAllowed('hideuser') ){
 				# this codepath is unreachable except by a malicious user spoofing forms,
 				# or by race conditions (user has oversight and sysop, loads block form,
 				# and is de-oversighted before submission); so need to fail completely
@@ -603,16 +613,13 @@ class SpecialBlock extends SpecialPage {
 			# Recheck params here...
 			if( $type != Block::TYPE_USER ) {
 				$data['HideUser'] = false; # IP users should not be hidden
-
 			} elseif( !in_array( $data['Expiry'], array( 'infinite', 'infinity', 'indefinite' ) ) ) {
 				# Bad expiry.
 				return array( 'ipb_expiry_temp' );
-
 			} elseif( $user->getEditCount() > self::HIDEUSER_CONTRIBLIMIT ) {
 				# Typically, the user should have a handful of edits.
 				# Disallow hiding users with many edits for performance.
 				return array( 'ipb_hide_invalid' );
-
 			} elseif( !$data['Confirm'] ){
 				return array( 'ipb-confirmhideuser' );
 			}
@@ -621,7 +628,7 @@ class SpecialBlock extends SpecialPage {
 		# Create block object.
 		$block = new Block();
 		$block->setTarget( $target );
-		$block->setBlocker( $wgUser );
+		$block->setBlocker( $performer );
 		$block->mReason = $data['Reason'][0];
 		$block->mExpiry = self::parseExpiryInput( $data['Expiry'] );
 		$block->prevents( 'createaccount', $data['CreateAccount'] );
@@ -631,7 +638,7 @@ class SpecialBlock extends SpecialPage {
 		$block->isAutoblocking( $data['AutoBlock'] );
 		$block->mHideName = $data['HideUser'];
 
-		if( !wfRunHooks( 'BlockIp', array( &$block, &$wgUser ) ) ) {
+		if( !wfRunHooks( 'BlockIp', array( &$block, &$performer ) ) ) {
 			return array( 'hookaborted' );
 		}
 
@@ -655,7 +662,7 @@ class SpecialBlock extends SpecialPage {
 
 				# If the name was hidden and the blocking user cannot hide
 				# names, then don't allow any block changes...
-				if( $currentBlock->mHideName && !$wgUser->isAllowed( 'hideuser' ) ) {
+				if( $currentBlock->mHideName && !$performer->isAllowed( 'hideuser' ) ) {
 					return array( 'cant-see-hidden-user' );
 				}
 
@@ -677,7 +684,7 @@ class SpecialBlock extends SpecialPage {
 			$logaction = 'block';
 		}
 
-		wfRunHooks( 'BlockIpComplete', array( $block, $wgUser ) );
+		wfRunHooks( 'BlockIpComplete', array( $block, $performer ) );
 
 		# Set *_deleted fields if requested
 		if( $data['HideUser'] ) {
@@ -686,7 +693,7 @@ class SpecialBlock extends SpecialPage {
 
 		# Can't watch a rangeblock
 		if( $type != Block::TYPE_RANGE && $data['Watch'] ) {
-			$wgUser->addWatch( Title::makeTitle( NS_USER, $target ) );
+			$performer->addWatch( Title::makeTitle( NS_USER, $target ) );
 		}
 
 		# Block constructor sanitizes certain block options on insert
@@ -737,9 +744,11 @@ class SpecialBlock extends SpecialPage {
 			if( strpos( $option, ':' ) === false ){
 				$option = "$option:$option";
 			}
+
 			list( $show, $value ) = explode( ':', $option );
 			$a[htmlspecialchars( $show )] = htmlspecialchars( $value );
 		}
+
 		return $a;
 	}
 
@@ -754,15 +763,19 @@ class SpecialBlock extends SpecialPage {
 		if( $infinity == null ){
 			$infinity = wfGetDB( DB_SLAVE )->getInfinity();
 		}
+
 		if ( $expiry == 'infinite' || $expiry == 'indefinite' ) {
 			$expiry = $infinity;
 		} else {
 			$expiry = strtotime( $expiry );
+
 			if ( $expiry < 0 || $expiry === false ) {
 				return false;
 			}
+
 			$expiry = wfTimestamp( TS_MW, $expiry );
 		}
+
 		return $expiry;
 	}
 
@@ -773,6 +786,7 @@ class SpecialBlock extends SpecialPage {
 	 */
 	public static function canBlockEmail( $user ) {
 		global $wgEnableUserEmail, $wgSysopEmailBans;
+
 		return ( $wgEnableUserEmail && $wgSysopEmailBans && $user->isAllowed( 'blockemail' ) );
 	}
 
@@ -781,22 +795,23 @@ class SpecialBlock extends SpecialPage {
 	 * others, and probably shouldn't be able to unblock themselves
 	 * either.
 	 * @param $user User|Int|String
+	 * @param $performer User user doing the request
 	 * @return Bool|String true or error message key
 	 */
-	public static function checkUnblockSelf( $user ) {
-		global $wgUser;
+	public static function checkUnblockSelf( $user, User $performer ) {
 		if ( is_int( $user ) ) {
 			$user = User::newFromId( $user );
 		} elseif ( is_string( $user ) ) {
 			$user = User::newFromName( $user );
 		}
-		if( $wgUser->isBlocked() ){
-			if( $user instanceof User && $user->getId() == $wgUser->getId() ) {
+
+		if( $performer->isBlocked() ){
+			if( $user instanceof User && $user->getId() == $performer->getId() ) {
 				# User is trying to unblock themselves
-				if ( $wgUser->isAllowed( 'unblockself' ) ) {
+				if ( $performer->isAllowed( 'unblockself' ) ) {
 					return true;
 				# User blocked themselves and is now trying to reverse it
-				} elseif ( $wgUser->blockedBy() === $wgUser->getName() ) {
+				} elseif ( $performer->blockedBy() === $performer->getName() ) {
 					return true;
 				} else {
 					return 'ipbnounblockself';
@@ -814,7 +829,7 @@ class SpecialBlock extends SpecialPage {
 	 * Return a comma-delimited list of "flags" to be passed to the log
 	 * reader for this block, to provide more information in the logs
 	 * @param $data Array from HTMLForm data
-	 * @param $type Block::TYPE_ constant
+	 * @param $type Block::TYPE_ constant (USER, RANGE, or IP)
 	 * @return array
 	 */
 	protected static function blockLogFlags( array $data, $type ) {
@@ -823,32 +838,58 @@ class SpecialBlock extends SpecialPage {
 
 		# when blocking a user the option 'anononly' is not available/has no effect -> do not write this into log
 		if( !$data['HardBlock'] && $type != Block::TYPE_USER ){
+			// For grepping: message block-log-flags-anononly
 			$flags[] = 'anononly';
 		}
 
 		if( $data['CreateAccount'] ){
+			// For grepping: message block-log-flags-nocreate
 			$flags[] = 'nocreate';
 		}
 
 		# Same as anononly, this is not displayed when blocking an IP address
-		if( !$data['AutoBlock'] && $type != Block::TYPE_IP ){
+		if( !$data['AutoBlock'] && $type == Block::TYPE_USER ){
+			// For grepping: message block-log-flags-noautoblock
 			$flags[] = 'noautoblock';
 		}
 
 		if( $data['DisableEmail'] ){
+			// For grepping: message block-log-flags-noemail
 			$flags[] = 'noemail';
 		}
 
 		if( $wgBlockAllowsUTEdit && $data['DisableUTEdit'] ){
+			// For grepping: message block-log-flags-nousertalk
 			$flags[] = 'nousertalk';
 		}
 
 		if( $data['HideUser'] ){
+			// For grepping: message block-log-flags-hiddenname
 			$flags[] = 'hiddenname';
 		}
 
 		return implode( ',', $flags );
 	}
+
+	/**
+	 * 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 function onSubmit( array $data ) {
+		// This isn't used since we need that HTMLForm that's passed in the
+		// second parameter. See alterForm for the real function
+	}
+
+	/**
+	 * Do something exciting on successful processing of the form, most likely to show a
+	 * confirmation message
+	 */
+	public function onSuccess() {
+		$out = $this->getOutput();
+		$out->setPageTitle( $this->msg( 'blockipsuccesssub' ) );
+		$out->addWikiMsg( 'blockipsuccesstext',  $this->target );
+	}
 }
 
 # BC @since 1.18