summaryrefslogtreecommitdiff
path: root/includes/specials/SpecialBlockList.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/specials/SpecialBlockList.php')
-rw-r--r--includes/specials/SpecialBlockList.php65
1 files changed, 17 insertions, 48 deletions
diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index f1992c0f..456f4ecb 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -27,8 +27,9 @@
* @ingroup SpecialPage
*/
class SpecialBlockList extends SpecialPage {
+ protected $target;
- protected $target, $options;
+ protected $options;
function __construct() {
parent::__construct( 'BlockList' );
@@ -37,7 +38,7 @@ class SpecialBlockList extends SpecialPage {
/**
* Main execution point
*
- * @param string $par title fragment
+ * @param string $par Title fragment
*/
public function execute( $par ) {
$this->setHeaders();
@@ -67,7 +68,7 @@ class SpecialBlockList extends SpecialPage {
$fields = array(
'Target' => array(
'type' => 'text',
- 'label-message' => 'ipadressorusername',
+ 'label-message' => 'ipaddressorusername',
'tabindex' => '1',
'size' => '45',
'default' => $this->target,
@@ -83,7 +84,7 @@ class SpecialBlockList extends SpecialPage {
'flatlist' => true,
),
'Limit' => array(
- 'class' => 'HTMLBlockedUsersItemSelect',
+ 'type' => 'limitselect',
'label-message' => 'table_pager_limit_label',
'options' => array(
$lang->formatNum( 20 ) => 20,
@@ -97,7 +98,7 @@ class SpecialBlockList extends SpecialPage {
),
);
$context = new DerivativeContext( $this->getContext() );
- $context->setTitle( $this->getTitle() ); // Remove subpage
+ $context->setTitle( $this->getPageTitle() ); // Remove subpage
$form = new HTMLForm( $fields, $context );
$form->setMethod( 'get' );
$form->setWrapperLegendMsg( 'ipblocklist-legend' );
@@ -180,11 +181,7 @@ class SpecialBlockList extends SpecialPage {
$pager = new BlockListPager( $this, $conds );
if ( $pager->getNumRows() ) {
- $out->addHTML(
- $pager->getNavigationBar() .
- $pager->getBody() .
- $pager->getNavigationBar()
- );
+ $out->addParserOutputContent( $pager->getFullOutput() );
} elseif ( $this->target ) {
$out->addWikiMsg( 'ipblocklist-no-results' );
} else {
@@ -203,7 +200,11 @@ class SpecialBlockList extends SpecialPage {
foreach ( $otherBlockLink as $link ) {
$list .= Html::rawElement( 'li', array(), $link ) . "\n";
}
- $out->addHTML( Html::rawElement( 'ul', array( 'class' => 'mw-ipblocklist-otherblocks' ), $list ) . "\n" );
+ $out->addHTML( Html::rawElement(
+ 'ul',
+ array( 'class' => 'mw-ipblocklist-otherblocks' ),
+ $list
+ ) . "\n" );
}
}
@@ -217,20 +218,20 @@ class BlockListPager extends TablePager {
protected $page;
/**
- * @param $page SpecialPage
- * @param $conds Array
+ * @param SpecialPage $page
+ * @param array $conds
*/
function __construct( $page, $conds ) {
$this->page = $page;
$this->conds = $conds;
- $this->mDefaultDirection = true;
+ $this->mDefaultDirection = IndexPager::DIR_DESCENDING;
parent::__construct( $page->getContext() );
}
function getFieldNames() {
static $headers = null;
- if ( $headers == array() ) {
+ if ( $headers === null ) {
$headers = array(
'ipb_timestamp' => 'blocklist-timestamp',
'ipb_target' => 'blocklist-target',
@@ -404,7 +405,7 @@ class BlockListPager extends TablePager {
}
public function getTableClass() {
- return 'TablePager mw-blocklist';
+ return parent::getTableClass() . ' mw-blocklist';
}
function getIndexField() {
@@ -452,35 +453,3 @@ class BlockListPager extends TablePager {
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;
- }
-}