X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialBlockList.php;h=f5a07642bf2aadcdfd4f6492e69b951c435e5af5;hb=29fa9ffa1972b8c47128f5bdc9a0238279548017;hp=a7b99e7f6d9b7ca66efc3c471d9cb5b5074b67bf;hpb=7cb45c0c30a11de35ce32e85a6f175e70a77a987;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index a7b99e7f6d..f5a07642bf 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -40,24 +40,24 @@ class SpecialBlockList extends SpecialPage {
 	 * @param $par String title fragment
 	 */
 	public function execute( $par ) {
-		global $wgOut, $wgRequest;
-
 		$this->setHeaders();
 		$this->outputHeader();
-		$wgOut->setPageTitle( wfMsg( 'ipblocklist' ) );
-		$wgOut->addModuleStyles( 'mediawiki.special' );
+		$out = $this->getOutput();
+		$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', array() );
+		$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;
 		}
 
@@ -68,6 +68,7 @@ class SpecialBlockList extends SpecialPage {
 				'label-message' => 'ipadressorusername',
 				'tabindex' => '1',
 				'size' => '45',
+				'default' => $this->target,
 			),
 			'Options' => array(
 				'type' => 'multiselect',
@@ -75,6 +76,7 @@ class SpecialBlockList extends SpecialPage {
 					wfMsg( 'blocklist-userblocks' ) => 'userblocks',
 					wfMsg( 'blocklist-tempblocks' ) => 'tempblocks',
 					wfMsg( 'blocklist-addressblocks' ) => 'addressblocks',
+					wfMsg( 'blocklist-rangeblocks' ) => 'rangeblocks',
 				),
 				'flatlist' => true,
 			),
@@ -90,8 +92,6 @@ class SpecialBlockList extends SpecialPage {
 	}
 
 	function showList() {
-		global $wgOut, $wgUser;
-
 		# Purge expired entries on one in every 10 queries
 		if ( !mt_rand( 0, 10 ) ) {
 			Block::purgeExpired();
@@ -99,7 +99,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;
 		}
 
@@ -108,6 +108,7 @@ class SpecialBlockList extends SpecialPage {
 
 			switch( $type ){
 				case Block::TYPE_ID:
+				case Block::TYPE_AUTO:
 					$conds['ipb_id'] = $target;
 					break;
 
@@ -142,36 +143,41 @@ 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(
+			$out->addHTML(
 				Html::rawElement( 'h2', array(), wfMsg( 'ipblocklist-localblock' ) ) . "\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(),
@@ -186,7 +192,7 @@ class SpecialBlockList extends SpecialPage {
 			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" );
 		}
 	}
 }
@@ -195,11 +201,15 @@ 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() {
@@ -221,11 +231,8 @@ class BlockListPager extends TablePager {
 	}
 
 	function formatValue( $name, $value ) {
-		global $wgLang, $wgUser;
-
-		static $sk, $msg;
-		if ( empty( $sk ) ) {
-			$sk = $this->getSkin();
+		static $msg = null;
+		if ( $msg === null ) {
 			$msg = array(
 				'anononlyblock',
 				'createaccountblock',
@@ -239,12 +246,14 @@ class BlockListPager extends TablePager {
 			$msg = array_combine( $msg, array_map( 'wfMessage', $msg ) );
 		}
 
+		/** @var $row object */
 		$row = $this->mCurrentRow;
+
 		$formatted = '';
 
 		switch( $name ) {
 			case 'ipb_timestamp':
-				$formatted = $wgLang->timeanddate( $value );
+				$formatted = $this->getLanguage()->timeanddate( $value, /* User preference timezone */ true );
 				break;
 
 			case 'ipb_target':
@@ -255,8 +264,8 @@ class BlockListPager extends TablePager {
 					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,
@@ -270,21 +279,21 @@ class BlockListPager extends TablePager {
 				break;
 
 			case 'ipb_expiry':
-				$formatted = $wgLang->formatExpiry( $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']
 						);
@@ -292,21 +301,22 @@ class BlockListPager extends TablePager {
 					$formatted .= ' ' . Html::rawElement(
 						'span',
 						array( 'class' => 'mw-blocklist-actions' ),
-						wfMsg( 'parentheses', $wgLang->pipeList( $links ) )
+						wfMsg( 'parentheses', $this->getLanguage()->pipeList( $links ) )
 					);
 				}
 				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':
@@ -317,7 +327,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'];
 				}
 
@@ -329,7 +339,7 @@ class BlockListPager extends TablePager {
 					$properties[] = $msg['blocklist-nousertalk'];
 				}
 
-				$formatted = $wgLang->commaList( $properties );
+				$formatted = $this->getLanguage()->commaList( $properties );
 				break;
 
 			default:
@@ -342,11 +352,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',
+				'user_name AS by_user_name',
 				'ipb_reason',
 				'ipb_timestamp',
 				'ipb_auto',
@@ -361,12 +374,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;
@@ -388,7 +401,36 @@ class BlockListPager extends TablePager {
 		return false;
 	}
 
-	function getTitle() {
-		return $this->page->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__ );
 	}
 }