Bug 32673: Keep the username in the input field if not existing

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

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index f6041ca..09af45c 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->setPageTitleMsg( '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' );
@@ -252,7 +267,7 @@ class BlockListPager extends TablePager {
 
                switch( $name ) {
                        case 'ipb_timestamp':
-                               $formatted = $this->getLang()->timeanddate( $value, /* User preference timezone */ true );
+                               $formatted = $this->getLanguage()->timeanddate( $value, /* User preference timezone */ true );
                                break;
 
                        case 'ipb_target':
@@ -278,7 +293,7 @@ class BlockListPager extends TablePager {
                                break;
 
                        case 'ipb_expiry':
-                               $formatted = $this->getLang()->formatExpiry( $value, /* User preference timezone */ true );
+                               $formatted = $this->getLanguage()->formatExpiry( $value, /* User preference timezone */ true );
                                if( $this->getUser()->isAllowed( 'block' ) ){
                                        if( $row->ipb_auto ){
                                                $links[] = Linker::linkKnown(
@@ -300,7 +315,7 @@ 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;
@@ -338,7 +353,7 @@ class BlockListPager extends TablePager {
                                        $properties[] = $msg['blocklist-nousertalk'];
                                }
 
-                               $formatted = $this->getLang()->commaList( $properties );
+                               $formatted = $this->getLanguage()->commaList( $properties );
                                break;
 
                        default:
@@ -433,3 +448,31 @@ 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;
+               }
+
+               if ( !in_array( $value, $this->mParams['options'] ) ) {
+                       $this->mParams['options'][ $this->mParent->getLanguage()->formatNum( $value ) ] = intval($value);
+               }
+
+               return true;
+       }
+
+}
\ No newline at end of file