X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialAllmessages.php;h=b562ebc6eeefc192d00a5a12a6a88b96bcbf9a7d;hb=a23d2475aafd0956a30549cbfff25f0c2e7a837e;hp=b88b6a6317bc90700c5ff26ea66d713a2fb4168c;hpb=bf38b304ae2db5d403c7eda49c4e0bc9d4c6d51f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index b88b6a6317..b562ebc6ee 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -1,6 +1,29 @@ 'get', 'action' => $wgScript, 'id' => 'mw-allmessages-form' ) ) . Xml::fieldset( wfMsg( 'allmessages-filter-legend' ) ) . - Xml::hidden( 'title', $this->getTitle() ) . + Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . Xml::openElement( 'table', array( 'class' => 'mw-allmessages-table' ) ) . "\n" . ' ' . @@ -77,19 +100,19 @@ class SpecialAllmessages extends SpecialPage { 'filter', 'unmodified', 'mw-allmessages-form-filter-unmodified', - ( $this->filter == 'unmodified' ? true : false ) + ( $this->filter == 'unmodified' ) ) . Xml::radioLabel( wfMsg( 'allmessages-filter-all' ), 'filter', 'all', 'mw-allmessages-form-filter-all', - ( $this->filter == 'all' ? true : false ) + ( $this->filter == 'all' ) ) . Xml::radioLabel( wfMsg( 'allmessages-filter-modified' ), 'filter', 'modified', 'mw-allmessages-form-filter-modified', - ( $this->filter == 'modified' ? true : false ) + ( $this->filter == 'modified' ) ) . "\n @@ -101,7 +124,7 @@ class SpecialAllmessages extends SpecialPage { 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' ) . @@ -126,8 +149,6 @@ class SpecialAllmessages extends SpecialPage { */ class AllmessagesTablePager extends TablePager { - var $messages = null; - var $talkPages = null; public $mLimitsShown; function __construct( $page, $conds, $langObj = null ) { @@ -136,10 +157,7 @@ class AllmessagesTablePager extends TablePager { $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') ); + $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 ); global $wgLang, $wgContLang, $wgRequest; @@ -152,7 +170,7 @@ class AllmessagesTablePager extends TablePager { 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; + $this->custom = ($wgRequest->getVal( 'filter' ) == 'unmodified'); } $prefix = $wgLang->ucfirst( $wgRequest->getVal( 'prefix', '' ) ); @@ -173,46 +191,29 @@ 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 ); + function getAllMessages( $descending ) { + wfProfileIn( __METHOD__ ); + $messageNames = Language::getLocalisationCache()->getSubitemList( 'en', 'messages' ); + if( $descending ){ + rsort( $messageNames ); } 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 ); - - // 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 ); - - $this->messages[$ukey]['customised'] = 0; //for now - - $sortedArray[$key] = null; // trade bytes from $sortedArray to this + asort( $messageNames ); } - wfProfileOut( __METHOD__ . '-cache' ); + // Normalise message names so they look like page titles + $messageNames = array_map( array( $this->lang, 'ucfirst' ), $messageNames ); + wfProfileIn( __METHOD__ ); - return true; + 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. + */ + function getCustomisedStatuses( $messageNames ) { wfProfileIn( __METHOD__ . '-db' ); $dbr = wfGetDB( DB_SLAVE ); @@ -222,56 +223,60 @@ class AllmessagesTablePager extends TablePager { __METHOD__, array( 'USE INDEX' => 'name_title' ) ); + $xNames = array_flip( $messageNames ); - while( $s = $dbr->fetchObject( $res ) ) { - if( $s->page_namespace == NS_MEDIAWIKI ){ - if( $this->foreign ){ + $pageFlags = $talkFlags = array(); + + foreach ( $res as $s ) { + 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; + if( count( $title ) === 2 && $this->langcode == $title[1] + && isset( $xNames[$title[0]] ) ) + { + $pageFlags["{$title[0]}"] = true; } - } else if( array_key_exists( $s->page_title, $this->messages ) ){ - $this->messages[$s->page_title]['customised'] = 1; + } elseif( isset( $xNames[$s->page_title] ) ) { + $pageFlags[$s->page_title] = true; } } else if( $s->page_namespace == NS_MEDIAWIKI_TALK ){ - $this->talkPages[$s->page_title] = 1; + $talkFlags[$s->page_title] = 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 * 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 = $this->getCustomisedStatuses( $messageNames ); $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( + $result->result[] = array( 'am_title' => $key, - 'am_actual' => $value['actual'], - 'am_default' => $value['default'], - 'am_customised' => $value['customised'], + 'am_actual' => wfMsgGetKey( $key, /*useDB*/true, $this->langcode, false ), + 'am_default' => wfMsgGetKey( $key, /*useDB*/false, $this->langcode, false ), + 'am_customised' => $customised, + 'am_talk_exists' => isset( $statuses['talks'][$key] ) ); - unset( $this->messages[$key] ); // save a few bytes $count++; } if( $count == $limit ) break; } - unset( $this->messages ); // no longer needed, free up some memory - return $mResult; + return $result; } function getStartBody() { @@ -311,7 +316,7 @@ class AllmessagesTablePager extends TablePager { array( 'broken' ) ); } - if( array_key_exists( $talk->getDBkey() , $this->talkPages ) ) { + if ( $this->mCurrentRow->am_talk_exists ) { $talk = $this->mSkin->linkKnown( $talk , $this->talk ); } else { $talk = $this->mSkin->link( @@ -325,7 +330,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 +345,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"; @@ -389,43 +393,4 @@ class AllmessagesTablePager extends TablePager { 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; - } -}