X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialBlockList.php;h=faaab72d4b8c0a8033a79834a4a3660bc77298cf;hb=023b1dafd3a961bef261925e14e26554dd4e6c9d;hp=c7f6b74d47c84af1278dfcda16bc0de04cc8f9d1;hpb=f050fabd6b51a3966697c189d92cd9c3673e474c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index c7f6b74d47..faaab72d4b 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -40,24 +40,25 @@ class SpecialBlockList extends SpecialPage {
 	 * @param $par String title fragment
 	 */
 	public function execute( $par ) {
-		global $wgUser, $wgOut, $wgRequest;
-
 		$this->setHeaders();
 		$this->outputHeader();
-		$wgOut->setPageTitle( wfMsg( 'ipblocklist' ) );
-		$wgOut->addModuleStyles( 'mediawiki.special' );
+		$out = $this->getOutput();
+		$lang = $this->getLanguage();
+		$out->setPageTitle( $this->msg( 'ipblocklist' ) );
+		$out->addModuleStyles( 'mediawiki.special' );
 
-		$par = $wgRequest->getVal( 'ip', $par );
-		$this->target = trim( $wgRequest->getVal( 'wpTarget', $par ) );
+		$request = $this->getRequest();
+		$par = $request->getVal( 'ip', $par );
+		$this->target = trim( $request->getVal( 'wpTarget', $par ) );
 
-		$this->options = $wgRequest->getArray( 'wpOptions' );
+		$this->options = $request->getArray( 'wpOptions', array() );
 
-		$action = $wgRequest->getText( 'action' );
+		$action = $request->getText( 'action' );
 
-		if( $action == 'unblock' || $action == 'submit' && $wgRequest->wasPosted() ) {
+		if( $action == 'unblock' || $action == 'submit' && $request->wasPosted() ) {
 			# B/C @since 1.18: Unblock interface is now at Special:Unblock
 			$title = SpecialPage::getTitleFor( 'Unblock', $this->target );
-			$wgOut->redirect( $title->getFullUrl() );
+			$out->redirect( $title->getFullUrl() );
 			return;
 		}
 
@@ -65,54 +66,46 @@ class SpecialBlockList extends SpecialPage {
 		$fields = array(
 			'Target' => array(
 				'type' => 'text',
-				'label-message' => 'ipaddressorusername',
+				'label-message' => 'ipadressorusername',
 				'tabindex' => '1',
 				'size' => '45',
+				'default' => $this->target,
 			),
 			'Options' => array(
 				'type' => 'multiselect',
 				'options' => array(
-					wfMsg( 'blocklist-userblocks' ) => 'userblocks',
-					wfMsg( 'blocklist-tempblocks' ) => 'tempblocks',
-					wfMsg( 'blocklist-addressblocks' ) => 'addressblocks',
+					$this->msg( 'blocklist-userblocks' )->text() => 'userblocks',
+					$this->msg( 'blocklist-tempblocks' )->text() => 'tempblocks',
+					$this->msg( 'blocklist-addressblocks' )->text() => 'addressblocks',
+					$this->msg( 'blocklist-rangeblocks' )->text() => 'rangeblocks',
+				),
+				'flatlist' => true,
+			),
+			'Limit' => array(
+				'class' => 'HTMLBlockedUsersItemSelect',
+				'label-message' => 'table_pager_limit_label',
+				'options' => array(
+					$lang->formatNum( 20 ) => 20,
+					$lang->formatNum( 50 ) => 50,
+					$lang->formatNum( 100 ) => 100,
+					$lang->formatNum( 250 ) => 250,
+					$lang->formatNum( 500 ) => 500,
 				),
-				'cssclass' => 'mw-htmlform-multiselect-flatlist',
+				'name' => 'limit',
+				'default' => 50,
 			),
 		);
-		$form = new HTMLForm( $fields );
-		$form->setTitle( $this->getTitle() );
+		$form = new HTMLForm( $fields, $this->getContext() );
 		$form->setMethod( 'get' );
-		$form->setWrapperLegend( wfMsg( 'ipblocklist-legend' ) );
-		$form->setSubmitText( wfMsg( 'ipblocklist-submit' ) );
+		$form->setWrapperLegendMsg( 'ipblocklist-legend' );
+		$form->setSubmitTextMsg( 'ipblocklist-submit' );
 		$form->prepareForm();
-		
+
 		$form->displayForm( '' );
 		$this->showList();
 	}
 
-	/**
-	 * Get the component of an IP address which is certain to be the same between an IP
-	 * address and a rangeblock containing that IP address.
-	 * @todo: should be in IP.php??
-	 * @param  $ip String
-	 * @return String
-	 */
-	protected static function getIpFragment( $ip ){
-		global $wgBlockCIDRLimit;
-		if( IP::isIPv4( $ip ) ){
-			$hexAddress = IP::toHex( $ip );
-			return substr( $hexAddress, 0,  wfBaseconvert( $wgBlockCIDRLimit['IPv4'], 10, 16 ) );
-		} elseif( IP::isIPv6( $ip ) ) {
-			$hexAddress = substr( IP::toHex( $ip ), 2 );
-			return 'v6-' . substr( $hexAddress, 0,  wfBaseconvert( $wgBlockCIDRLimit['IPv6'], 10, 16 ) );
-		} else {
-			return null;
-		}
-	}
-
 	function showList() {
-		global $wgOut, $wgUser;
-
 		# Purge expired entries on one in every 10 queries
 		if ( !mt_rand( 0, 10 ) ) {
 			Block::purgeExpired();
@@ -120,7 +113,7 @@ class SpecialBlockList extends SpecialPage {
 
 		$conds = array();
 		# Is the user allowed to see hidden blocks?
-		if ( !$wgUser->isAllowed( 'hideuser' ) ){
+		if ( !$this->getUser()->isAllowed( 'hideuser' ) ){
 			$conds['ipb_deleted'] = 0;
 		}
 
@@ -129,29 +122,21 @@ class SpecialBlockList extends SpecialPage {
 
 			switch( $type ){
 				case Block::TYPE_ID:
+				case Block::TYPE_AUTO:
 					$conds['ipb_id'] = $target;
 					break;
 
 				case Block::TYPE_IP:
-				case BLock::TYPE_RANGE:
+				case Block::TYPE_RANGE:
 					list( $start, $end ) = IP::parseRange( $target );
-					# Per bug 14634, we want to include relevant active rangeblocks; for
-					# rangeblocks, we want to include larger ranges which enclose the given
-					# range. We know that all blocks must be smaller than $wgBlockCIDRLimit,
-					# so we can improve performance by filtering on a LIKE clause
-					$chunk = self::getIpFragment( $start );
 					$dbr = wfGetDB( DB_SLAVE );
-					$like = $dbr->buildLike( $chunk, $dbr->anyString() );
-						
-					# Fairly hard to make a malicious SQL statement out of hex characters,
-					# but stranger things have happened...
-					$safeStart = $dbr->addQuotes( IP::toHex( $start ) );
-					$safeEnd = $dbr->addQuotes( IP::toHex( $end ) );
-					$safeTarget = $dbr->addQuotes( IP::toHex( $target ) );
-
-					# TODO: abstract this away
-					$conds[] = "(ipb_address = $safeTarget) OR
-						(ipb_range_start $like AND ipb_range_start <= $safeStart AND ipb_range_end >= $safeEnd)";
+					$conds[] = $dbr->makeList(
+						array(
+							'ipb_address' => $target,
+							Block::getRangeCond( $start, $end )
+						),
+						LIST_OR
+					);
 					$conds['ipb_auto'] = 0;
 					break;
 
@@ -172,51 +157,52 @@ class SpecialBlockList extends SpecialPage {
 		if( in_array( 'addressblocks', $this->options ) ) {
 			$conds[] = "ipb_user != 0 OR ipb_range_end > ipb_range_start";
 		}
+		if( in_array( 'rangeblocks', $this->options ) ) {
+			$conds[] = "ipb_range_end = ipb_range_start";
+		}
 
 		# Check for other blocks, i.e. global/tor blocks
 		$otherBlockLink = array();
 		wfRunHooks( 'OtherBlockLogLink', array( &$otherBlockLink, $this->target ) );
 
+		$out = $this->getOutput();
+
 		# Show additional header for the local block only when other blocks exists.
 		# Not necessary in a standard installation without such extensions enabled
 		if( count( $otherBlockLink ) ) {
-			$wgOut->addHTML(
-				Html::rawElement( 'h2', array(), wfMsg( 'ipblocklist-localblock' ) ) . "\n"
+			$out->addHTML(
+				Html::element( 'h2', array(), $this->msg( 'ipblocklist-localblock' )->text() ) . "\n"
 			);
 		}
 
 		$pager = new BlockListPager( $this, $conds );
 		if ( $pager->getNumRows() ) {
-			$wgOut->addHTML(
+			$out->addHTML(
 				$pager->getNavigationBar() .
 				$pager->getBody().
 				$pager->getNavigationBar()
 			);
 
 		} elseif ( $this->target ) {
-			$wgOut->addWikiMsg( 'ipblocklist-no-results' );
+			$out->addWikiMsg( 'ipblocklist-no-results' );
 
 		} else {
-			$wgOut->addWikiMsg( 'ipblocklist-empty' );
+			$out->addWikiMsg( 'ipblocklist-empty' );
 		}
 
 		if( count( $otherBlockLink ) ) {
-			$wgOut->addHTML(
+			$out->addHTML(
 				Html::rawElement(
 					'h2',
 					array(),
-					wfMsgExt(
-						'ipblocklist-otherblocks',
-						'parseinline',
-						count( $otherBlockLink )
-					)
+					$this->msg( 'ipblocklist-otherblocks', count( $otherBlockLink ) )->parse()
 				) . "\n"
 			);
 			$list = '';
 			foreach( $otherBlockLink as $link ) {
 				$list .= Html::rawElement( 'li', array(), $link ) . "\n";
 			}
-			$wgOut->addHTML( Html::rawElement( 'ul', array( 'class' => 'mw-ipblocklist-otherblocks' ), $list ) . "\n" );
+			$out->addHTML( Html::rawElement( 'ul', array( 'class' => 'mw-ipblocklist-otherblocks' ), $list ) . "\n" );
 		}
 	}
 }
@@ -225,15 +211,18 @@ class BlockListPager extends TablePager {
 	protected $conds;
 	protected $page;
 
+	/**
+	 * @param $page SpecialPage
+	 * @param $conds Array
+	 */
 	function __construct( $page, $conds ) {
 		$this->page = $page;
 		$this->conds = $conds;
 		$this->mDefaultDirection = true;
-		parent::__construct();
+		parent::__construct( $page->getContext() );
 	}
 
 	function getFieldNames() {
-		global $wgUser;
 		static $headers = null;
 
 		if ( $headers == array() ) {
@@ -245,18 +234,17 @@ class BlockListPager extends TablePager {
 				'ipb_params' => 'blocklist-params',
 				'ipb_reason' => 'blocklist-reason',
 			);
-			$headers = array_map( 'wfMsg', $headers );
+			foreach( $headers as $key => $val ) {
+				$headers[$key] = $this->msg( $val )->text();
+			}
 		}
 
 		return $headers;
 	}
 
 	function formatValue( $name, $value ) {
-		global $wgOut, $wgLang, $wgUser;
-
-		static $sk, $msg;
-		if ( empty( $sk ) ) {
-			$sk = $wgUser->getSkin();
+		static $msg = null;
+		if ( $msg === null ) {
 			$msg = array(
 				'anononlyblock',
 				'createaccountblock',
@@ -265,28 +253,31 @@ class BlockListPager extends TablePager {
 				'blocklist-nousertalk',
 				'unblocklink',
 				'change-blocklink',
+				'infiniteblock',
 			);
-			$msg = array_combine( $msg, array_map( 'wfMessage', $msg ) );
+			$msg = array_combine( $msg, array_map( array( $this, 'msg' ), $msg ) );
 		}
 
+		/** @var $row object */
 		$row = $this->mCurrentRow;
+
 		$formatted = '';
 
 		switch( $name ) {
 			case 'ipb_timestamp':
-				$formatted = $wgLang->timeanddate( $value );
+				$formatted = $this->getLanguage()->userTimeAndDate( $value, $this->getUser() );
 				break;
 
 			case 'ipb_target':
 				if( $row->ipb_auto ){
-					$formatted = wfMessage( 'autoblockid', $row->ipb_id );
+					$formatted = $this->msg( 'autoblockid', $row->ipb_id )->parse();
 				} else {
 					list( $target, $type ) = Block::parseTarget( $row->ipb_address );
 					switch( $type ){
 						case Block::TYPE_USER:
 						case Block::TYPE_IP:
-							$formatted = $sk->userLink( $target->getId(), $target );
-							$formatted .= $sk->userToolLinks(
+							$formatted = Linker::userLink( $target->getId(), $target );
+							$formatted .= Linker::userToolLinks(
 								$target->getId(),
 								$target,
 								false,
@@ -300,21 +291,21 @@ class BlockListPager extends TablePager {
 				break;
 
 			case 'ipb_expiry':
-				$formatted = $wgLang->timeanddate( $value );
-				if( $wgUser->isAllowed( 'block' ) ){
+				$formatted = $this->getLanguage()->formatExpiry( $value, /* User preference timezone */ true );
+				if( $this->getUser()->isAllowed( 'block' ) ){
 					if( $row->ipb_auto ){
-						$links[] = $sk->linkKnown(
+						$links[] = Linker::linkKnown(
 							SpecialPage::getTitleFor( 'Unblock' ),
 							$msg['unblocklink'],
 							array(),
 							array( 'wpTarget' => "#{$row->ipb_id}" )
 						);
 					} else {
-						$links[] = $sk->linkKnown(
+						$links[] = Linker::linkKnown(
 							SpecialPage::getTitleFor( 'Unblock', $row->ipb_address ),
 							$msg['unblocklink']
 						);
-						$links[] = $sk->linkKnown(
+						$links[] = Linker::linkKnown(
 							SpecialPage::getTitleFor( 'Block', $row->ipb_address ),
 							$msg['change-blocklink']
 						);
@@ -322,21 +313,23 @@ class BlockListPager extends TablePager {
 					$formatted .= ' ' . Html::rawElement(
 						'span',
 						array( 'class' => 'mw-blocklist-actions' ),
-						"[{$wgLang->pipeList($links)}]"
+						$this->msg( 'parentheses' )->rawParams(
+							$this->getLanguage()->pipeList( $links ) )->escaped()
 					);
 				}
 				break;
 
 			case 'ipb_by':
-				$user = User::newFromId( $value );
-				if( $user instanceof User ){
-					$formatted = $sk->userLink( $user->getId(), $user->getName() );
-					$formatted .= $sk->userToolLinks( $user->getId(), $user->getName() );
+				if ( isset( $row->by_user_name ) ) {
+					$formatted = Linker::userLink( $value, $row->by_user_name );
+					$formatted .= Linker::userToolLinks( $value, $row->by_user_name );
+				} else {
+					$formatted = htmlspecialchars( $row->ipb_by_text ); // foreign user?
 				}
 				break;
 
 			case 'ipb_reason':
-				$formatted = $sk->commentBlock( $value );
+				$formatted = Linker::commentBlock( $value );
 				break;
 
 			case 'ipb_params':
@@ -347,7 +340,7 @@ class BlockListPager extends TablePager {
 				if ( $row->ipb_create_account ) {
 					$properties[] = $msg['createaccountblock'];
 				}
-				if ( !$row->ipb_enable_autoblock ) {
+				if ( $row->ipb_user && !$row->ipb_enable_autoblock ) {
 					$properties[] = $msg['noautoblockblock'];
 				}
 
@@ -359,7 +352,7 @@ class BlockListPager extends TablePager {
 					$properties[] = $msg['blocklist-nousertalk'];
 				}
 
-				$formatted = $wgLang->commaList( $properties );
+				$formatted = $this->getLanguage()->commaList( $properties );
 				break;
 
 			default:
@@ -372,11 +365,14 @@ class BlockListPager extends TablePager {
 
 	function getQueryInfo() {
 		$info = array(
-			'tables' => array( 'ipblocks' ),
+			'tables' => array( 'ipblocks', 'user' ),
 			'fields' => array(
 				'ipb_id',
 				'ipb_address',
+				'ipb_user',
 				'ipb_by',
+				'ipb_by_text',
+				'by_user_name' => 'user_name',
 				'ipb_reason',
 				'ipb_timestamp',
 				'ipb_auto',
@@ -391,12 +387,12 @@ class BlockListPager extends TablePager {
 				'ipb_allow_usertalk',
 			),
 			'conds' => $this->conds,
+			'join_conds' => array( 'user' => array( 'LEFT JOIN', 'user_id = ipb_by' ) )
 		);
 
-		global $wgUser;
 		# Is the user allowed to see hidden blocks?
-		if ( !$wgUser->isAllowed( 'hideuser' ) ){
-			$conds['ipb_deleted'] = 0;
+		if ( !$this->getUser()->isAllowed( 'hideuser' ) ){
+			$info['conds']['ipb_deleted'] = 0;
 		}
 
 		return $info;
@@ -418,7 +414,69 @@ class BlockListPager extends TablePager {
 		return false;
 	}
 
-	function getTitle() {
-		return $this->mPage->getTitle();
+	/**
+	 * Do a LinkBatch query to minimise database load when generating all these links
+	 * @param $result
+	 */
+	function preprocessResults( $result ){
+		wfProfileIn( __METHOD__ );
+		# Do a link batch query
+		$lb = new LinkBatch;
+		$lb->setCaller( __METHOD__ );
+
+		$userids = array();
+
+		foreach ( $result as $row ) {
+			$userids[] = $row->ipb_by;
+
+			# Usernames and titles are in fact related by a simple substitution of space -> underscore
+			# The last few lines of Title::secureAndSplit() tell the story.
+			$name = str_replace( ' ', '_', $row->ipb_address );
+			$lb->add( NS_USER, $name );
+			$lb->add( NS_USER_TALK, $name );
+		}
+
+		$ua = UserArray::newFromIDs( $userids );
+		foreach( $ua as $user ){
+			$name = str_replace( ' ', '_', $user->getName() );
+			$lb->add( NS_USER, $name );
+			$lb->add( NS_USER_TALK, $name );
+		}
+
+		$lb->execute();
+		wfProfileOut( __METHOD__ );
 	}
 }
+
+/**
+ * Items per page dropdown. Essentially a crap workaround for bug 32603.
+ *
+ * @todo Do not release 1.19 with this.
+ */
+class HTMLBlockedUsersItemSelect extends HTMLSelectField {
+	/**
+	 * Basically don't do any validation. If it's a number that's fine. Also,
+	 * add it to the list if it's not there already
+	 *
+	 * @param $value
+	 * @param $alldata
+	 * @return bool
+	 */
+	function validate( $value, $alldata ) {
+		if ( $value == '' ) {
+			return true;
+		}
+
+		// Let folks pick an explicit limit not from our list, as long as it's a real numbr.
+		if ( !in_array( $value, $this->mParams['options'] ) && $value == intval( $value ) && $value > 0 ) {
+			// This adds the explicitly requested limit value to the drop-down,
+			// then makes sure it's sorted correctly so when we output the list
+			// later, the custom option doesn't just show up last.
+			$this->mParams['options'][ $this->mParent->getLanguage()->formatNum( $value ) ] = intval($value);
+			asort( $this->mParams['options'] );
+		}
+
+		return true;
+	}
+
+}