From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- includes/specials/SpecialAllmessages.php | 143 ++++++++++++++++--------------- 1 file changed, 76 insertions(+), 67 deletions(-) (limited to 'includes/specials/SpecialAllmessages.php') diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index a60c8efe..35d6a0c0 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -28,7 +28,6 @@ * @ingroup SpecialPage */ class SpecialAllmessages extends SpecialPage { - /** * @var AllmessagesTablePager */ @@ -53,8 +52,9 @@ class SpecialAllmessages extends SpecialPage { $this->setHeaders(); global $wgUseDatabaseMessages; - if( !$wgUseDatabaseMessages ) { + if ( !$wgUseDatabaseMessages ) { $out->addWikiMsg( 'allmessagesnotsupportedDB' ); + return; } else { $this->outputHeader( 'allmessagestext' ); @@ -74,7 +74,6 @@ class SpecialAllmessages extends SpecialPage { $this->table->getNavigationBar() . $this->table->getBody() . $this->table->getNavigationBar() ); - } protected function getGroupName() { @@ -87,7 +86,6 @@ class SpecialAllmessages extends SpecialPage { * getting data from a table when in fact not all of it comes from the database. */ class AllmessagesTablePager extends TablePager { - protected $filter, $prefix, $langcode, $displayPrefix; public $mLimitsShown; @@ -121,15 +119,15 @@ class AllmessagesTablePager extends TablePager { $request = $this->getRequest(); $this->filter = $request->getVal( 'filter', 'all' ); - if( $this->filter === 'all' ) { + if ( $this->filter === 'all' ) { $this->custom = null; // So won't match in either case } else { - $this->custom = ($this->filter == 'unmodified'); + $this->custom = ( $this->filter == 'unmodified' ); } $prefix = $this->getLanguage()->ucfirst( $request->getVal( 'prefix', '' ) ); $prefix = $prefix != '' ? Title::makeTitleSafe( NS_MEDIAWIKI, $request->getVal( 'prefix', null ) ) : null; - if( $prefix !== null ) { + if ( $prefix !== null ) { $this->displayPrefix = $prefix->getDBkey(); $this->prefix = '/^' . preg_quote( $this->displayPrefix ) . '/i'; } else { @@ -139,7 +137,7 @@ class AllmessagesTablePager extends TablePager { // The suffix that may be needed for message names if we're in a // different language (eg [[MediaWiki:Foo/fr]]: $suffix = '/fr' - if( $this->foreign ) { + if ( $this->foreign ) { $this->suffix = '/' . $this->langcode; } else { $this->suffix = ''; @@ -159,36 +157,36 @@ class AllmessagesTablePager extends TablePager { Xml::openElement( 'table', array( 'class' => 'mw-allmessages-table' ) ) . "\n" . ' ' . - Xml::label( $this->msg( 'allmessages-prefix' )->text(), 'mw-allmessages-form-prefix' ) . - "\n - " . - Xml::input( 'prefix', 20, str_replace( '_', ' ', $this->displayPrefix ), array( 'id' => 'mw-allmessages-form-prefix' ) ) . - "\n + Xml::label( $this->msg( 'allmessages-prefix' )->text(), 'mw-allmessages-form-prefix' ) . + "\n + " . + Xml::input( 'prefix', 20, str_replace( '_', ' ', $this->displayPrefix ), array( 'id' => 'mw-allmessages-form-prefix' ) ) . + "\n \n - " . - $this->msg( 'allmessages-filter' )->escaped() . - "\n + " . + $this->msg( 'allmessages-filter' )->escaped() . + "\n " . - Xml::radioLabel( $this->msg( 'allmessages-filter-unmodified' )->text(), - 'filter', - 'unmodified', - 'mw-allmessages-form-filter-unmodified', - ( $this->filter == 'unmodified' ) - ) . - Xml::radioLabel( $this->msg( 'allmessages-filter-all' )->text(), - 'filter', - 'all', - 'mw-allmessages-form-filter-all', - ( $this->filter == 'all' ) - ) . - Xml::radioLabel( $this->msg( 'allmessages-filter-modified' )->text(), - 'filter', - 'modified', - 'mw-allmessages-form-filter-modified', - ( $this->filter == 'modified' ) - ) . - "\n + Xml::radioLabel( $this->msg( 'allmessages-filter-unmodified' )->text(), + 'filter', + 'unmodified', + 'mw-allmessages-form-filter-unmodified', + ( $this->filter == 'unmodified' ) + ) . + Xml::radioLabel( $this->msg( 'allmessages-filter-all' )->text(), + 'filter', + 'all', + 'mw-allmessages-form-filter-all', + ( $this->filter == 'all' ) + ) . + Xml::radioLabel( $this->msg( 'allmessages-filter-modified' )->text(), + 'filter', + 'modified', + 'mw-allmessages-form-filter-modified', + ( $this->filter == 'modified' ) + ) . + "\n \n " . $langSelect[0] . "\n @@ -197,29 +195,30 @@ class AllmessagesTablePager extends TablePager { ' ' . - Xml::label( $this->msg( 'table_pager_limit_label' )->text(), 'mw-table_pager_limit_label' ) . - ' - ' . - $this->getLimitSelect() . - ' + Xml::label( $this->msg( 'table_pager_limit_label' )->text(), 'mw-table_pager_limit_label' ) . + ' + ' . + $this->getLimitSelect() . + ' ' . - Xml::submitButton( $this->msg( 'allmessages-filter-submit' )->text() ) . - "\n + Xml::submitButton( $this->msg( 'allmessages-filter-submit' )->text() ) . + "\n " . Xml::closeElement( 'table' ) . $this->getHiddenFields( array( 'title', 'prefix', 'filter', 'lang', 'limit' ) ) . Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); + return $out; } function getAllMessages( $descending ) { wfProfileIn( __METHOD__ ); $messageNames = Language::getLocalisationCache()->getSubitemList( 'en', 'messages' ); - if( $descending ) { + if ( $descending ) { rsort( $messageNames ); } else { asort( $messageNames ); @@ -229,6 +228,7 @@ class AllmessagesTablePager extends TablePager { $messageNames = array_map( array( $this->lang, 'ucfirst' ), $messageNames ); wfProfileOut( __METHOD__ ); + return $messageNames; } @@ -260,18 +260,19 @@ class AllmessagesTablePager extends TablePager { foreach ( $res as $s ) { $exists = false; - if( $foreign ) { + if ( $foreign ) { $title = explode( '/', $s->page_title ); - if( count( $title ) === 2 && $langcode == $title[1] - && isset( $xNames[$title[0]] ) ) { + if ( count( $title ) === 2 && $langcode == $title[1] + && isset( $xNames[$title[0]] ) + ) { $exists = $title[0]; } - } elseif( isset( $xNames[$s->page_title] ) ) { + } elseif ( isset( $xNames[$s->page_title] ) ) { $exists = $s->page_title; } - if( $exists && $s->page_namespace == NS_MEDIAWIKI ) { + if ( $exists && $s->page_namespace == NS_MEDIAWIKI ) { $pageFlags[$exists] = true; - } elseif( $exists && $s->page_namespace == NS_MEDIAWIKI_TALK ) { + } elseif ( $exists && $s->page_namespace == NS_MEDIAWIKI_TALK ) { $talkFlags[$exists] = true; } } @@ -284,6 +285,9 @@ class AllmessagesTablePager extends TablePager { /** * This function normally does a database query to get the results; we need * to make a pretend result using a FakeResultWrapper. + * @param string $offset + * @param int $limit + * @param bool $descending * @return FakeResultWrapper */ function reallyDoQuery( $offset, $limit, $descending ) { @@ -293,27 +297,29 @@ class AllmessagesTablePager extends TablePager { $statuses = self::getCustomisedStatuses( $messageNames, $this->langcode, $this->foreign ); $count = 0; - foreach( $messageNames as $key ) { + foreach ( $messageNames as $key ) { $customised = isset( $statuses['pages'][$key] ); - if( $customised !== $this->custom && + if ( $customised !== $this->custom && ( $descending && ( $key < $offset || !$offset ) || !$descending && $key > $offset ) && ( ( $this->prefix && preg_match( $this->prefix, $key ) ) || $this->prefix === false ) ) { $actual = wfMessage( $key )->inLanguage( $this->langcode )->plain(); $default = wfMessage( $key )->inLanguage( $this->langcode )->useDatabase( false )->plain(); $result->result[] = array( - 'am_title' => $key, - 'am_actual' => $actual, - 'am_default' => $default, + 'am_title' => $key, + 'am_actual' => $actual, + 'am_default' => $default, 'am_customised' => $customised, 'am_talk_exists' => isset( $statuses['talks'][$key] ) ); $count++; } - if( $count == $limit ) { + + if ( $count == $limit ) { break; } } + return $result; } @@ -321,26 +327,26 @@ class AllmessagesTablePager extends TablePager { return Xml::openElement( 'table', array( 'class' => 'mw-datatable TablePager', 'id' => 'mw-allmessagestable' ) ) . "\n" . " " . - $this->msg( 'allmessagesname' )->escaped() . " + $this->msg( 'allmessagesname' )->escaped() . " " . - $this->msg( 'allmessagesdefault' )->escaped() . - " + $this->msg( 'allmessagesdefault' )->escaped() . + " \n " . - $this->msg( 'allmessagescurrent' )->escaped() . - " + $this->msg( 'allmessagescurrent' )->escaped() . + " \n"; } function formatValue( $field, $value ) { - switch( $field ) { + switch ( $field ) { case 'am_title' : $title = Title::makeTitle( NS_MEDIAWIKI, $value . $this->suffix ); $talk = Title::makeTitle( NS_MEDIAWIKI_TALK, $value . $this->suffix ); - if( $this->mCurrentRow->am_customised ) { + if ( $this->mCurrentRow->am_customised ) { $title = Linker::linkKnown( $title, $this->getLanguage()->lcfirst( $value ) ); } else { $title = Linker::link( @@ -362,6 +368,7 @@ class AllmessagesTablePager extends TablePager { array( 'broken' ) ); } + return $title . ' ' . $this->msg( 'parentheses' )->rawParams( $talk )->escaped(); case 'am_default' : @@ -376,7 +383,7 @@ class AllmessagesTablePager extends TablePager { $s = parent::formatRow( $row ); // But if there's a customised message, add that too. - if( $row->am_customised ) { + if ( $row->am_customised ) { $s .= Xml::openElement( 'tr', $this->getRowAttrs( $row, true ) ); $formatted = strval( $this->formatValue( 'am_actual', $row->am_actual ) ); if ( $formatted == '' ) { @@ -385,24 +392,26 @@ class AllmessagesTablePager extends TablePager { $s .= Xml::tags( 'td', $this->getCellAttrs( 'am_actual', $row->am_actual ), $formatted ) . "\n"; } + return $s; } function getRowAttrs( $row, $isSecond = false ) { $arr = array(); - if( $row->am_customised ) { + if ( $row->am_customised ) { $arr['class'] = 'allmessages-customised'; } - if( !$isSecond ) { + if ( !$isSecond ) { $arr['id'] = Sanitizer::escapeId( 'msg_' . $this->getLanguage()->lcfirst( $row->am_title ) ); } + return $arr; } function getCellAttrs( $field, $value ) { - if( $this->mCurrentRow->am_customised && $field == 'am_title' ) { + if ( $this->mCurrentRow->am_customised && $field == 'am_title' ) { return array( 'rowspan' => '2', 'class' => $field ); - } elseif( $field == 'am_title' ) { + } elseif ( $field == 'am_title' ) { return array( 'class' => $field ); } else { return array( 'lang' => $this->langcode, 'dir' => $this->lang->getDir(), 'class' => $field ); -- cgit v1.2.2