revert r106095, fix apparently not this simple

[lhc/web/wiklou.git] / includes / specials / SpecialBlockList.php

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 2a917c3..ea6fe22 100644 (file)
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -43,7 +43,8 @@ class SpecialBlockList extends SpecialPage {
                $this->setHeaders();
                $this->outputHeader();
                $out = $this->getOutput();
-               $out->setPageTitle( wfMsg( 'ipblocklist' ) );
+               $lang = $this->getLanguage();
+               $out->setPageTitle( $this->msg( 'ipblocklist' ) );
                $out->addModuleStyles( 'mediawiki.special' );
 
                $request = $this->getRequest();
@@ -68,6 +69,7 @@ class SpecialBlockList extends SpecialPage {
                                'label-message' => 'ipadressorusername',
                                'tabindex' => '1',
                                'size' => '45',
+                               'default' => $this->target,
                        ),
                        'Options' => array(
                                'type' => 'multiselect',
@@ -79,6 +81,19 @@ class SpecialBlockList extends SpecialPage {
                                ),
                                '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,
+                               ),
+                               'name' => 'limit',
+                               'default' => 50,
+                       ),
                );
                $form = new HTMLForm( $fields, $this->getContext() );
                $form->setMethod( 'get' );
@@ -200,6 +215,10 @@ class BlockListPager extends TablePager {
        protected $conds;
        protected $page;
 
+       /**
+        * @param $page SpecialPage
+        * @param $conds Array
+        */
        function __construct( $page, $conds ) {
                $this->page = $page;
                $this->conds = $conds;
@@ -241,12 +260,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 = $this->getLang()->timeanddate( $value, /* User preference timezome */ true );
+                               $formatted = $this->getLanguage()->timeanddate( $value, /* User preference timezone */ true );
                                break;
 
                        case 'ipb_target':
@@ -272,7 +293,7 @@ class BlockListPager extends TablePager {
                                break;
 
                        case 'ipb_expiry':
-                               $formatted = $this->getLang()->formatExpiry( $value, /* User preference timezome */ true );
+                               $formatted = $this->getLanguage()->formatExpiry( $value, /* User preference timezone */ true );
                                if( $this->getUser()->isAllowed( 'block' ) ){
                                        if( $row->ipb_auto ){
                                                $links[] = Linker::linkKnown(
@@ -294,16 +315,17 @@ class BlockListPager extends TablePager {
                                        $formatted .= ' ' . Html::rawElement(
                                                'span',
                                                array( 'class' => 'mw-blocklist-actions' ),
-                                               wfMsg( 'parentheses', $this->getLang()->pipeList( $links ) )
+                                               wfMsg( 'parentheses', $this->getLanguage()->pipeList( $links ) )
                                        );
                                }
                                break;
 
                        case 'ipb_by':
-                               $user = User::newFromId( $value );
-                               if( $user instanceof User ){
-                                       $formatted = Linker::userLink( $user->getId(), $user->getName() );
-                                       $formatted .= Linker::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;
 
@@ -331,7 +353,7 @@ class BlockListPager extends TablePager {
                                        $properties[] = $msg['blocklist-nousertalk'];
                                }
 
-                               $formatted = $this->getLang()->commaList( $properties );
+                               $formatted = $this->getLanguage()->commaList( $properties );
                                break;
 
                        default:
@@ -344,12 +366,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',
@@ -364,6 +388,7 @@ class BlockListPager extends TablePager {
                                'ipb_allow_usertalk',
                        ),
                        'conds' => $this->conds,
+                       'join_conds' => array( 'user' => array( 'LEFT JOIN', 'user_id = ipb_by' ) )
                );
 
                # Is the user allowed to see hidden blocks?
@@ -389,4 +414,70 @@ class BlockListPager extends TablePager {
        function isFieldSortable( $name ) {
                return false;
        }
+
+       /**
+        * 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;
+       }
+
 }