Merge "Http::getProxy() method to get proxy configuration"

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

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 9defaba..e589ecb 100644 (file)
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -46,14 +46,13 @@ class SpecialBlockList extends SpecialPage {
                $out = $this->getOutput();
                $lang = $this->getLanguage();
                $out->setPageTitle( $this->msg( 'ipblocklist' ) );
-               $out->addModuleStyles( 'mediawiki.special' );
-               $out->addModules( 'mediawiki.userSuggest' );
+               $out->addModuleStyles( [ 'mediawiki.special', 'mediawiki.special.blocklist' ] );
 
                $request = $this->getRequest();
                $par = $request->getVal( 'ip', $par );
                $this->target = trim( $request->getVal( 'wpTarget', $par ) );
 
-               $this->options = $request->getArray( 'wpOptions', array() );
+               $this->options = $request->getArray( 'wpOptions', [] );
 
                $action = $request->getText( 'action' );
 
@@ -69,42 +68,41 @@ class SpecialBlockList extends SpecialPage {
                $pager = $this->getBlockListPager();
 
                # Just show the block list
-               $fields = array(
-                       'Target' => array(
-                               'type' => 'text',
+               $fields = [
+                       'Target' => [
+                               'type' => 'user',
                                'label-message' => 'ipaddressorusername',
                                'tabindex' => '1',
                                'size' => '45',
                                'default' => $this->target,
-                               'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
-                       ),
-                       'Options' => array(
+                       ],
+                       'Options' => [
                                'type' => 'multiselect',
-                               'options-messages' => array(
+                               'options-messages' => [
                                        'blocklist-userblocks' => 'userblocks',
                                        'blocklist-tempblocks' => 'tempblocks',
                                        'blocklist-addressblocks' => 'addressblocks',
                                        'blocklist-rangeblocks' => 'rangeblocks',
-                               ),
+                               ],
                                'flatlist' => true,
-                       ),
-                       'Limit' => array(
+                       ],
+                       'Limit' => [
                                'type' => 'limitselect',
                                'label-message' => 'table_pager_limit_label',
-                               'options' => array(
+                               'options' => [
                                        $lang->formatNum( 20 ) => 20,
                                        $lang->formatNum( 50 ) => 50,
                                        $lang->formatNum( 100 ) => 100,
                                        $lang->formatNum( 250 ) => 250,
                                        $lang->formatNum( 500 ) => 500,
-                               ),
+                               ],
                                'name' => 'limit',
                                'default' => $pager->getLimit(),
-                       ),
-               );
+                       ],
+               ];
                $context = new DerivativeContext( $this->getContext() );
                $context->setTitle( $this->getPageTitle() ); // Remove subpage
-               $form = new HTMLForm( $fields, $context );
+               $form = HTMLForm::factory( 'ooui', $fields, $context );
                $form->setMethod( 'get' );
                $form->setWrapperLegendMsg( 'ipblocklist-legend' );
                $form->setSubmitTextMsg( 'ipblocklist-submit' );
@@ -120,7 +118,7 @@ class SpecialBlockList extends SpecialPage {
         * @return BlockListPager
         */
        protected function getBlockListPager() {
-               $conds = array();
+               $conds = [];
                # Is the user allowed to see hidden blocks?
                if ( !$this->getUser()->isAllowed( 'hideuser' ) ) {
                        $conds['ipb_deleted'] = 0;
@@ -140,10 +138,10 @@ class SpecialBlockList extends SpecialPage {
                                        list( $start, $end ) = IP::parseRange( $target );
                                        $dbr = wfGetDB( DB_SLAVE );
                                        $conds[] = $dbr->makeList(
-                                               array(
+                                               [
                                                        'ipb_address' => $target,
                                                        Block::getRangeCond( $start, $end )
-                                               ),
+                                               ],
                                                LIST_OR
                                        );
                                        $conds['ipb_auto'] = 0;
@@ -181,14 +179,14 @@ class SpecialBlockList extends SpecialPage {
                $out = $this->getOutput();
 
                # Check for other blocks, i.e. global/tor blocks
-               $otherBlockLink = array();
-               Hooks::run( 'OtherBlockLogLink', array( &$otherBlockLink, $this->target ) );
+               $otherBlockLink = [];
+               Hooks::run( 'OtherBlockLogLink', [ &$otherBlockLink, $this->target ] );
 
                # 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 ) ) {
                        $out->addHTML(
-                               Html::element( 'h2', array(), $this->msg( 'ipblocklist-localblock' )->text() ) . "\n"
+                               Html::element( 'h2', [], $this->msg( 'ipblocklist-localblock' )->text() ) . "\n"
                        );
                }
 
@@ -204,17 +202,17 @@ class SpecialBlockList extends SpecialPage {
                        $out->addHTML(
                                Html::rawElement(
                                        'h2',
-                                       array(),
+                                       [],
                                        $this->msg( 'ipblocklist-otherblocks', count( $otherBlockLink ) )->parse()
                                ) . "\n"
                        );
                        $list = '';
                        foreach ( $otherBlockLink as $link ) {
-                               $list .= Html::rawElement( 'li', array(), $link ) . "\n";
+                               $list .= Html::rawElement( 'li', [], $link ) . "\n";
                        }
                        $out->addHTML( Html::rawElement(
                                'ul',
-                               array( 'class' => 'mw-ipblocklist-otherblocks' ),
+                               [ 'class' => 'mw-ipblocklist-otherblocks' ],
                                $list
                        ) . "\n" );
                }
@@ -244,14 +242,14 @@ class BlockListPager extends TablePager {
                static $headers = null;
 
                if ( $headers === null ) {
-                       $headers = array(
+                       $headers = [
                                'ipb_timestamp' => 'blocklist-timestamp',
                                'ipb_target' => 'blocklist-target',
                                'ipb_expiry' => 'blocklist-expiry',
                                'ipb_by' => 'blocklist-by',
                                'ipb_params' => 'blocklist-params',
                                'ipb_reason' => 'blocklist-reason',
-                       );
+                       ];
                        foreach ( $headers as $key => $val ) {
                                $headers[$key] = $this->msg( $val )->text();
                        }
@@ -263,7 +261,7 @@ class BlockListPager extends TablePager {
        function formatValue( $name, $value ) {
                static $msg = null;
                if ( $msg === null ) {
-                       $keys = array(
+                       $keys = [
                                'anononlyblock',
                                'createaccountblock',
                                'noautoblockblock',
@@ -271,7 +269,7 @@ class BlockListPager extends TablePager {
                                'blocklist-nousertalk',
                                'unblocklink',
                                'change-blocklink',
-                       );
+                       ];
 
                        foreach ( $keys as $key ) {
                                $msg[$key] = $this->msg( $key )->escaped();
@@ -322,8 +320,8 @@ class BlockListPager extends TablePager {
                                                $links[] = Linker::linkKnown(
                                                        SpecialPage::getTitleFor( 'Unblock' ),
                                                        $msg['unblocklink'],
-                                                       array(),
-                                                       array( 'wpTarget' => "#{$row->ipb_id}" )
+                                                       [],
+                                                       [ 'wpTarget' => "#{$row->ipb_id}" ]
                                                );
                                        } else {
                                                $links[] = Linker::linkKnown(
@@ -337,7 +335,7 @@ class BlockListPager extends TablePager {
                                        }
                                        $formatted .= ' ' . Html::rawElement(
                                                'span',
-                                               array( 'class' => 'mw-blocklist-actions' ),
+                                               [ 'class' => 'mw-blocklist-actions' ],
                                                $this->msg( 'parentheses' )->rawParams(
                                                        $language->pipeList( $links ) )->escaped()
                                        );
@@ -358,7 +356,7 @@ class BlockListPager extends TablePager {
                                break;
 
                        case 'ipb_params':
-                               $properties = array();
+                               $properties = [];
                                if ( $row->ipb_anon_only ) {
                                        $properties[] = $msg['anononlyblock'];
                                }
@@ -389,9 +387,9 @@ class BlockListPager extends TablePager {
        }
 
        function getQueryInfo() {
-               $info = array(
-                       'tables' => array( 'ipblocks', 'user' ),
-                       'fields' => array(
+               $info = [
+                       'tables' => [ 'ipblocks', 'user' ],
+                       'fields' => [
                                'ipb_id',
                                'ipb_address',
                                'ipb_user',
@@ -410,10 +408,10 @@ class BlockListPager extends TablePager {
                                'ipb_deleted',
                                'ipb_block_email',
                                'ipb_allow_usertalk',
-                       ),
+                       ],
                        'conds' => $this->conds,
-                       'join_conds' => array( 'user' => array( 'LEFT JOIN', 'user_id = ipb_by' ) )
-               );
+                       'join_conds' => [ 'user' => [ 'LEFT JOIN', 'user_id = ipb_by' ] ]
+               ];
 
                # Filter out any expired blocks
                $db = $this->getDatabase();