X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialAllmessages.php;h=5ab48ddc2bb4620b7a7ce22ff2b62454399f18b9;hb=7cf8b3197c58b7c938e33f3eea2e119fa7cf8cf8;hp=b88b6a6317bc90700c5ff26ea66d713a2fb4168c;hpb=e6a275409ccdb15feabac24cd4649cfdb57e1be4;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index b88b6a6317..5ab48ddc2b 100644
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -1,11 +1,39 @@
getRequest();
+ $out = $this->getOutput();
$this->setHeaders();
global $wgUseDatabaseMessages;
if( !$wgUseDatabaseMessages ) {
- $wgOut->addWikiMsg( 'allmessagesnotsupportedDB' );
+ $out->addWikiMsg( 'allmessagesnotsupportedDB' );
return;
} else {
$this->outputHeader( 'allmessagestext' );
}
- $this->filter = $wgRequest->getVal( 'filter', 'all' );
- $this->prefix = $wgRequest->getVal( 'prefix', '' );
+ $out->addModuleStyles( 'mediawiki.special' );
+
+ $this->filter = $request->getVal( 'filter', 'all' );
+ $this->prefix = $request->getVal( 'prefix', '' );
$this->table = new AllmessagesTablePager(
$this,
- $conds = array(),
- wfGetLangObj( $wgRequest->getVal( 'lang', $par ) )
+ array(),
+ wfGetLangObj( $request->getVal( 'lang', $par ) )
);
- $this->langCode = $this->table->lang->getCode();
+ $this->langcode = $this->table->lang->getCode();
- $wgOut->addHTML( $this->buildForm() .
+ $out->addHTML( $this->table->buildForm() .
$this->table->getNavigationBar() .
- $this->table->getLimitForm() .
$this->table->getBody() .
$this->table->getNavigationBar() );
}
+}
+
+/**
+ * Use TablePager for prettified output. We have to pretend that we're
+ * 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;
+
+ /**
+ * @var Language
+ */
+ public $lang;
+
+ /**
+ * @var null|bool
+ */
+ public $custom;
+
+ function __construct( $page, $conds, $langObj = null ) {
+ parent::__construct( $page->getContext() );
+ $this->mIndexField = 'am_title';
+ $this->mPage = $page;
+ $this->mConds = $conds;
+ $this->mDefaultDirection = true; // always sort ascending
+ $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 );
+
+ global $wgContLang;
+
+ $this->talk = $this->msg( 'talkpagelinktext' )->escaped();
+
+ $this->lang = ( $langObj ? $langObj : $wgContLang );
+ $this->langcode = $this->lang->getCode();
+ $this->foreign = $this->langcode != $wgContLang->getCode();
+
+ $request = $this->getRequest();
+
+ if( $request->getVal( 'filter', 'all' ) === 'all' ){
+ $this->custom = null; // So won't match in either case
+ } else {
+ $this->custom = ($request->getVal( 'filter' ) == 'unmodified');
+ }
+
+ $prefix = $this->getLang()->ucfirst( $request->getVal( 'prefix', '' ) );
+ $prefix = $prefix != '' ? Title::makeTitleSafe( NS_MEDIAWIKI, $request->getVal( 'prefix', null ) ) : null;
+ if( $prefix !== null ){
+ $this->displayPrefix = $prefix->getDBkey();
+ $this->prefix = '/^' . preg_quote( $this->displayPrefix ) . '/i';
+ } else {
+ $this->displayPrefix = false;
+ $this->prefix = false;
+ }
+
+ // 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 ) {
+ $this->suffix = '/' . $this->langcode;
+ } else {
+ $this->suffix = '';
+ }
+ }
+
function buildForm() {
global $wgScript;
@@ -57,162 +152,107 @@ class SpecialAllmessages extends SpecialPage {
ksort( $languages );
$out = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-allmessages-form' ) ) .
- Xml::fieldset( wfMsg( 'allmessages-filter-legend' ) ) .
- Xml::hidden( 'title', $this->getTitle() ) .
+ Xml::fieldset( $this->msg( 'allmessages-filter-legend' )->text() ) .
+ Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
Xml::openElement( 'table', array( 'class' => 'mw-allmessages-table' ) ) . "\n" .
'
| ' .
- Xml::label( wfMsg( 'allmessages-prefix' ), 'mw-allmessages-form-prefix' ) .
+ Xml::label( $this->msg( 'allmessages-prefix' )->text(), 'mw-allmessages-form-prefix' ) .
" | \n
" .
- Xml::input( 'prefix', 20, str_replace( '_', ' ', $this->prefix ), array( 'id' => 'mw-allmessages-form-prefix' ) ) .
+ Xml::input( 'prefix', 20, str_replace( '_', ' ', $this->displayPrefix ), array( 'id' => 'mw-allmessages-form-prefix' ) ) .
" | \n
\n
| " .
- wfMsg( 'allmessages-filter' ) .
+ $this->msg( 'allmessages-filter' )->escaped() .
" | \n
" .
- Xml::radioLabel( wfMsg( 'allmessages-filter-unmodified' ),
+ Xml::radioLabel( $this->msg( 'allmessages-filter-unmodified' )->text(),
'filter',
'unmodified',
'mw-allmessages-form-filter-unmodified',
- ( $this->filter == 'unmodified' ? true : false )
+ ( $this->filter == 'unmodified' )
) .
- Xml::radioLabel( wfMsg( 'allmessages-filter-all' ),
+ Xml::radioLabel( $this->msg( 'allmessages-filter-all' )->text(),
'filter',
'all',
'mw-allmessages-form-filter-all',
- ( $this->filter == 'all' ? true : false )
+ ( $this->filter == 'all' )
) .
- Xml::radioLabel( wfMsg( 'allmessages-filter-modified' ),
+ Xml::radioLabel( $this->msg( 'allmessages-filter-modified' )->text(),
'filter',
'modified',
'mw-allmessages-form-filter-modified',
- ( $this->filter == 'modified' ? true : false )
+ ( $this->filter == 'modified' )
) .
" | \n
\n
| " .
- Xml::label( wfMsg( 'allmessages-language' ), 'mw-allmessages-form-lang' ) .
+ Xml::label( $this->msg( 'allmessages-language' )->text(), 'mw-allmessages-form-lang' ) .
" | \n
" .
Xml::openElement( 'select', array( 'id' => 'mw-allmessages-form-lang', 'name' => 'lang' ) );
foreach( $languages as $lang => $name ) {
- $selected = $lang == $this->langCode ? true : false;
+ $selected = $lang == $this->langcode;
$out .= Xml::option( $lang . ' - ' . $name, $lang, $selected ) . "\n";
}
$out .= Xml::closeElement( 'select' ) .
" | \n
-
- \n
+
" .
+
+ '
+ | ' .
+ Xml::label( $this->msg( 'table_pager_limit_label' )->text(), 'mw-table_pager_limit_label' ) .
+ ' |
+ ' .
+ $this->getLimitSelect() .
+ ' |
+
|
- " .
- Xml::submitButton( wfMsg( 'allmessages-filter-submit' ) ) .
+ | ' .
+ Xml::submitButton( $this->msg( 'allmessages-filter-submit' )->text() ) .
" | \n
" .
+
Xml::closeElement( 'table' ) .
- $this->table->getHiddenFields( array( 'title', 'prefix', 'filter', 'lang' ) ) .
+ $this->getHiddenFields( array( 'title', 'prefix', 'filter', 'lang', 'limit' ) ) .
Xml::closeElement( 'fieldset' ) .
Xml::closeElement( 'form' );
return $out;
}
-}
-
-/* use TablePager for prettified output. We have to pretend that we're
- * getting data from a table when in fact not all of it comes from the database.
- */
-class AllmessagesTablePager extends TablePager {
-
- var $messages = null;
- var $talkPages = null;
- public $mLimitsShown;
-
- function __construct( $page, $conds, $langObj = null ) {
- parent::__construct();
- $this->mIndexField = 'am_title';
- $this->mPage = $page;
- $this->mConds = $conds;
- $this->mDefaultDirection = true; // always sort ascending
- // We want to have an option for people to view *all* the messages,
- // so they can use Ctrl+F to search them. 5000 is the maximum that
- // will get through WebRequest::getLimitOffset().
- $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 => wfMsg('limitall') );
-
- global $wgLang, $wgContLang, $wgRequest;
-
- $this->talk = htmlspecialchars( wfMsg( 'talkpagelinktext' ) );
-
- $this->lang = ( $langObj ? $langObj : $wgContLang );
- $this->langcode = $this->lang->getCode();
- $this->foreign = $this->langcode != $wgContLang->getCode();
-
- if( $wgRequest->getVal( 'filter', 'all' ) === 'all' ){
- $this->custom = null; // So won't match in either case
- } else {
- $this->custom = $wgRequest->getVal( 'filter' ) == 'unmodified' ? 1 : 0;
- }
-
- $prefix = $wgLang->ucfirst( $wgRequest->getVal( 'prefix', '' ) );
- $prefix = $prefix != '' ? Title::makeTitleSafe( NS_MEDIAWIKI, $wgRequest->getVal( 'prefix', null ) ) : null;
- if( $prefix !== null ){
- $this->prefix = '/^' . preg_quote( $prefix->getDBkey() ) . '/i';
- } else {
- $this->prefix = false;
- }
- $this->getSkin();
-
- // 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 ) {
- $this->suffix = '/' . $this->langcode;
- } else {
- $this->suffix = '';
- }
- }
-
- function getAllMessages( $desc ){
- wfProfileIn( __METHOD__ . '-cache' );
- # Make sure all extension messages are available
- global $wgMessageCache;
- $wgMessageCache->loadAllMessages( 'en' );
- $sortedArray = Language::getMessagesFor( 'en' );
- if( $desc ){
- krsort( $sortedArray );
+ function getAllMessages( $descending ) {
+ wfProfileIn( __METHOD__ );
+ $messageNames = Language::getLocalisationCache()->getSubitemList( 'en', 'messages' );
+ if( $descending ){
+ rsort( $messageNames );
} else {
- ksort( $sortedArray );
+ asort( $messageNames );
}
- $this->messages = array();
- foreach( $sortedArray as $key => $value ) {
- // All messages start with lowercase, but wikis might have both
- // upper and lowercase MediaWiki: pages if $wgCapitalLinks=false.
- $ukey = $this->lang->ucfirst( $key );
-
- // The value without any overrides from the MediaWiki: namespace
- $this->messages[$ukey]['default'] = wfMsgGetKey( $key, /*useDB*/false, $this->langcode, false );
-
- // The message that's actually used by the site
- $this->messages[$ukey]['actual'] = wfMsgGetKey( $key, /*useDB*/true, $this->langcode, false );
+ // Normalise message names so they look like page titles
+ $messageNames = array_map( array( $this->lang, 'ucfirst' ), $messageNames );
- $this->messages[$ukey]['customised'] = 0; //for now
-
- $sortedArray[$key] = null; // trade bytes from $sortedArray to this
- }
-
- wfProfileOut( __METHOD__ . '-cache' );
-
- return true;
+ wfProfileOut( __METHOD__ );
+ return $messageNames;
}
- # We only need a list of which messages have *been* customised;
- # their content is already in the message cache.
- function markCustomisedMessages(){
- $this->talkPages = array();
-
+ /**
+ * Determine which of the MediaWiki and MediaWiki_talk namespace pages exist.
+ * Returns array( 'pages' => ..., 'talks' => ... ), where the subarrays have
+ * an entry for each existing page, with the key being the message name and
+ * value arbitrary.
+ *
+ * @param array $messageNames
+ * @param string $langcode What language code
+ * @param bool $foreign Whether the $langcode is not the content language
+ * @return array: a 'pages' and 'talks' array with the keys of existing pages
+ */
+ public static function getCustomisedStatuses( $messageNames, $langcode = 'en', $foreign = false ) {
+ // FIXME: This function should be moved to Language:: or something.
wfProfileIn( __METHOD__ . '-db' );
$dbr = wfGetDB( DB_SLAVE );
@@ -222,77 +262,86 @@ class AllmessagesTablePager extends TablePager {
__METHOD__,
array( 'USE INDEX' => 'name_title' )
);
+ $xNames = array_flip( $messageNames );
+
+ $pageFlags = $talkFlags = array();
- while( $s = $dbr->fetchObject( $res ) ) {
- if( $s->page_namespace == NS_MEDIAWIKI ){
- if( $this->foreign ){
- $title = explode( '/', $s->page_title );
- if( count( $title ) === 2 && $this->langcode == $title[1] && array_key_exists( $title[0], $this->messages ) ){
- $this->messages["{$title[0]}"]['customised'] = 1;
- }
- } else if( array_key_exists( $s->page_title, $this->messages ) ){
- $this->messages[$s->page_title]['customised'] = 1;
+ foreach ( $res as $s ) {
+ $exists = false;
+ if( $foreign ) {
+ $title = explode( '/', $s->page_title );
+ if( count( $title ) === 2 && $langcode == $title[1]
+ && isset( $xNames[$title[0]] ) ) {
+ $exists = $title[0];
}
- } else if( $s->page_namespace == NS_MEDIAWIKI_TALK ){
- $this->talkPages[$s->page_title] = 1;
+ } elseif( isset( $xNames[$s->page_title] ) ) {
+ $exists = $s->page_title;
+ }
+ if( $exists && $s->page_namespace == NS_MEDIAWIKI ) {
+ $pageFlags[$exists] = true;
+ } elseif( $exists && $s->page_namespace == NS_MEDIAWIKI_TALK ) {
+ $talkFlags[$exists] = true;
}
}
- $dbr->freeResult( $res );
wfProfileOut( __METHOD__ . '-db' );
- return true;
+ return array( 'pages' => $pageFlags, 'talks' => $talkFlags );
}
- /* This function normally does a database query to get the results; we need
+ /**
+ * This function normally does a database query to get the results; we need
* to make a pretend result using a FakeResultWrapper.
*/
- function reallyDoQuery( $offset, $limit, $descending ){
- $mResult = new FakeResultWrapper( array() );
+ function reallyDoQuery( $offset, $limit, $descending ) {
+ $result = new FakeResultWrapper( array() );
- if( !$this->messages ) $this->getAllMessages( $descending );
- if( $this->talkPages === null ) $this->markCustomisedMessages();
+ $messageNames = $this->getAllMessages( $descending );
+ $statuses = self::getCustomisedStatuses( $messageNames, $this->langcode, $this->foreign );
$count = 0;
- foreach( $this->messages as $key => $value ){
- if( $value['customised'] !== $this->custom &&
+ foreach( $messageNames as $key ) {
+ $customised = isset( $statuses['pages'][$key] );
+ if( $customised !== $this->custom &&
( $descending && ( $key < $offset || !$offset ) || !$descending && $key > $offset ) &&
( ( $this->prefix && preg_match( $this->prefix, $key ) ) || $this->prefix === false )
- ){
- $mResult->result[] = array(
+ ) {
+ $actual = wfMessage( $key )->inLanguage( $this->langcode )->plain();
+ $default = wfMessage( $key )->inLanguage( $this->langcode )->useDatabase( false )->plain();
+ $result->result[] = array(
'am_title' => $key,
- 'am_actual' => $value['actual'],
- 'am_default' => $value['default'],
- 'am_customised' => $value['customised'],
+ 'am_actual' => $actual,
+ 'am_default' => $default,
+ 'am_customised' => $customised,
+ 'am_talk_exists' => isset( $statuses['talks'][$key] )
);
- unset( $this->messages[$key] ); // save a few bytes
$count++;
}
- if( $count == $limit ) break;
+ if( $count == $limit ) {
+ break;
+ }
}
- unset( $this->messages ); // no longer needed, free up some memory
- return $mResult;
+ return $result;
}
function getStartBody() {
- return Xml::openElement( 'table', array( 'class' => 'TablePager', 'id' => 'mw-allmessagestable' ) ) . "\n" .
+ return Xml::openElement( 'table', array( 'class' => 'mw-datatable TablePager', 'id' => 'mw-allmessagestable' ) ) . "\n" .
"
| " .
- wfMsg( 'allmessagesname' ) . "
+ $this->msg( 'allmessagesname' )->escaped() . "
|
" .
- wfMsg( 'allmessagesdefault' ) .
+ $this->msg( 'allmessagesdefault' )->escaped() .
" |
\n
| " .
- wfMsg( 'allmessagescurrent' ) .
+ $this->msg( 'allmessagescurrent' )->escaped() .
" |
\n";
}
function formatValue( $field, $value ){
- global $wgLang;
switch( $field ){
case 'am_title' :
@@ -301,20 +350,20 @@ class AllmessagesTablePager extends TablePager {
$talk = Title::makeTitle( NS_MEDIAWIKI_TALK, $value . $this->suffix );
if( $this->mCurrentRow->am_customised ){
- $title = $this->mSkin->linkKnown( $title, $wgLang->lcfirst( $value ) );
+ $title = Linker::linkKnown( $title, $this->getLang()->lcfirst( $value ) );
} else {
- $title = $this->mSkin->link(
+ $title = Linker::link(
$title,
- $wgLang->lcfirst( $value ),
+ $this->getLang()->lcfirst( $value ),
array(),
array(),
array( 'broken' )
);
}
- if( array_key_exists( $talk->getDBkey() , $this->talkPages ) ) {
- $talk = $this->mSkin->linkKnown( $talk , $this->talk );
+ if ( $this->mCurrentRow->am_talk_exists ) {
+ $talk = Linker::linkKnown( $talk , $this->talk );
} else {
- $talk = $this->mSkin->link(
+ $talk = Linker::link(
$talk,
$this->talk,
array(),
@@ -325,7 +374,6 @@ class AllmessagesTablePager extends TablePager {
return $title . ' (' . $talk . ')';
case 'am_default' :
- return Sanitizer::escapeHtmlAllowEntities( $value, ENT_QUOTES );
case 'am_actual' :
return Sanitizer::escapeHtmlAllowEntities( $value, ENT_QUOTES );
}
@@ -341,7 +389,7 @@ class AllmessagesTablePager extends TablePager {
$s .= Xml::openElement( 'tr', $this->getRowAttrs( $row, true ) );
$formatted = strval( $this->formatValue( 'am_actual', $row->am_actual ) );
if ( $formatted == '' ) {
- $formatted = ' ';
+ $formatted = ' ';
}
$s .= Xml::tags( 'td', $this->getCellAttrs( 'am_actual', $row->am_actual ), $formatted )
. "\n";
@@ -351,12 +399,11 @@ class AllmessagesTablePager extends TablePager {
function getRowAttrs( $row, $isSecond = false ){
$arr = array();
- global $wgLang;
if( $row->am_customised ){
$arr['class'] = 'allmessages-customised';
}
if( !$isSecond ){
- $arr['id'] = Sanitizer::escapeId( 'msg_' . $wgLang->lcfirst( $row->am_title ) );
+ $arr['id'] = Sanitizer::escapeId( 'msg_' . $this->getLang()->lcfirst( $row->am_title ) );
}
return $arr;
}
@@ -364,68 +411,35 @@ class AllmessagesTablePager extends TablePager {
function getCellAttrs( $field, $value ){
if( $this->mCurrentRow->am_customised && $field == 'am_title' ){
return array( 'rowspan' => '2', 'class' => $field );
- } else {
+ } else if( $field == 'am_title' ) {
return array( 'class' => $field );
+ } else {
+ return array( 'lang' => $this->langcode, 'dir' => $this->lang->getDir(), 'class' => $field );
}
}
// This is not actually used, as getStartBody is overridden above
function getFieldNames() {
return array(
- 'am_title' => wfMsg( 'allmessagesname' ),
- 'am_default' => wfMsg( 'allmessagesdefault' )
+ 'am_title' => $this->msg( 'allmessagesname' )->text(),
+ 'am_default' => $this->msg( 'allmessagesdefault' )->text()
);
}
+
function getTitle() {
return SpecialPage::getTitleFor( 'Allmessages', false );
}
+
function isFieldSortable( $x ){
return false;
}
+
function getDefaultSort(){
return '';
}
+
function getQueryInfo(){
return '';
}
}
-/* Overloads the relevant methods of the real ResultsWrapper so it
- * doesn't go anywhere near an actual database.
- */
-class FakeResultWrapper extends ResultWrapper {
- var $result = array();
- var $db = null; // And it's going to stay that way :D
- var $pos = 0;
- var $currentRow = null;
-
- function __construct( $array ){
- $this->result = $array;
- }
-
- function numRows() {
- return count( $this->result );
- }
-
- function fetchRow() {
- $this->currentRow = $this->result[$this->pos++];
- return $this->currentRow;
- }
-
- function seek( $row ) {
- $this->pos = $row;
- }
-
- function free() {}
-
- // Callers want to be able to access fields with $this->fieldName
- function fetchObject(){
- $this->currentRow = $this->result[$this->pos++];
- return (object)$this->currentRow;
- }
-
- function rewind() {
- $this->pos = 0;
- $this->currentRow = null;
- }
-}