X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialAllmessages.php;h=5ab48ddc2bb4620b7a7ce22ff2b62454399f18b9;hb=7cf8b3197c58b7c938e33f3eea2e119fa7cf8cf8;hp=06474b483958c07f1de8ce77c2f0119f24f90315;hpb=e27f805bff1ca27dab8495b58cac962be8e534f8;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index 06474b4839..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->table = new AllmessagesTablePager( $this,
- $conds=array(),
- wfGetLangObj( $wgRequest->getVal( 'lang', false ) ) );
+ $this->filter = $request->getVal( 'filter', 'all' );
+ $this->prefix = $request->getVal( 'prefix', '' );
- $this->langCode = $this->table->lang->getCode();
+ $this->table = new AllmessagesTablePager(
+ $this,
+ array(),
+ wfGetLangObj( $request->getVal( 'lang', $par ) )
+ );
- $wgOut->addHTML( $this->buildForm() .
+ $this->langcode = $this->table->lang->getCode();
+
+ $out->addHTML( $this->table->buildForm() .
$this->table->getNavigationBar() .
- $this->table->getLimitForm() .
$this->table->getBody() .
$this->table->getNavigationBar() );
}
- function buildForm() {
- $url = $this->getTitle()->escapeLocalURL();
- $languages = Language::getLanguageNames( false );
- ksort( $languages );
-
- $out = "";
- return $out;
- }
}
-/* use TablePager for prettified output. We have to pretend that we're
+/**
+ * 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;
+ protected $filter, $prefix, $langcode, $displayPrefix;
+
+ public $mLimitsShown;
+
+ /**
+ * @var Language
+ */
+ public $lang;
+
+ /**
+ * @var null|bool
+ */
+ public $custom;
- function __construct( $page, $conds, $langObj = NULL ) {
- parent::__construct();
+ 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->mDefaultDirection = true; // always sort ascending
+ $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 );
- global $wgLang, $wgContLang, $wgRequest;
+ global $wgContLang;
- $this->talk = $wgLang->lc( htmlspecialchars( wfMsg( 'talkpagelinktext' ) ) );
+ $this->talk = $this->msg( 'talkpagelinktext' )->escaped();
$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
+ $request = $this->getRequest();
+
+ if( $request->getVal( 'filter', 'all' ) === 'all' ){
+ $this->custom = null; // So won't match in either case
} else {
- $this->custom = $wgRequest->getVal( 'filter' ) == 'unmodified' ? 1 : 0;
+ $this->custom = ($request->getVal( 'filter' ) == 'unmodified');
}
- $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';
+ $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;
}
- $this->getSkin();
- //The suffix that may be needed for message names if we're in a
- //different language (eg [[MediaWiki:Foo/fr]]: $suffix = '/fr'
+ // 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 {
@@ -143,116 +145,203 @@ class AllmessagesTablePager extends TablePager {
}
}
- 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 );
- } else {
- ksort( $sortedArray );
- }
-
- $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 );
+ function buildForm() {
+ global $wgScript;
- // The value without any overrides from the MediaWiki: namespace
- $this->messages[$ukey]['default'] = wfMsgGetKey( $key, /*useDB*/false, $this->langcode, false );
+ $languages = Language::getLanguageNames( false );
+ ksort( $languages );
- // The message that's actually used by the site
- $this->messages[$ukey]['actual'] = wfMsgGetKey( $key, /*useDB*/true, $this->langcode, false );
+ $out = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-allmessages-form' ) ) .
+ 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( $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
+ " .
+ 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
+ | " .
+ Xml::label( $this->msg( 'allmessages-language' )->text(), 'mw-allmessages-form-lang' ) .
+ " | \n
+ " .
+ Xml::openElement( 'select', array( 'id' => 'mw-allmessages-form-lang', 'name' => 'lang' ) );
- $this->messages[$ukey]['customised'] = 0; //for now
+ foreach( $languages as $lang => $name ) {
+ $selected = $lang == $this->langcode;
+ $out .= Xml::option( $lang . ' - ' . $name, $lang, $selected ) . "\n";
+ }
+ $out .= Xml::closeElement( 'select' ) .
+ " | \n
+
" .
+
+ '
+ | ' .
+ 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::closeElement( 'table' ) .
+ $this->getHiddenFields( array( 'title', 'prefix', 'filter', 'lang', 'limit' ) ) .
+ Xml::closeElement( 'fieldset' ) .
+ Xml::closeElement( 'form' );
+ return $out;
+ }
- $sortedArray[$key] = NULL; // trade bytes from $sortedArray to this
+ function getAllMessages( $descending ) {
+ wfProfileIn( __METHOD__ );
+ $messageNames = Language::getLocalisationCache()->getSubitemList( 'en', 'messages' );
+ if( $descending ){
+ rsort( $messageNames );
+ } else {
+ asort( $messageNames );
}
- wfProfileOut( __METHOD__ . '-cache' );
+ // Normalise message names so they look like page titles
+ $messageNames = array_map( array( $this->lang, 'ucfirst' ), $messageNames );
- 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();
-
- wfProfileIn( __METHOD__ . "-db" );
+ /**
+ * 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 );
$res = $dbr->select( 'page',
array( 'page_namespace', 'page_title' ),
- array( 'page_namespace' => array(NS_MEDIAWIKI,NS_MEDIAWIKI_TALK) ),
+ array( 'page_namespace' => array( NS_MEDIAWIKI, NS_MEDIAWIKI_TALK ) ),
__METHOD__,
array( 'USE INDEX' => 'name_title' )
);
+ $xNames = array_flip( $messageNames );
- while( $s = $dbr->fetchObject( $res ) ) {
- if( $s->page_namespace == NS_MEDIAWIKI ){
- if( $this->foreign ){
- $title = explode( '/', $s->page_title );
- if( $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;
+ $pageFlags = $talkFlags = array();
+
+ 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" );
+ 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(
+ ( ( $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' => $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 "