Follow-up to r90265: directionality improvements as part of bug 6100 (under $wgBetter...
[lhc/web/wiklou.git] / includes / specials / SpecialAllmessages.php
index 15db4b3..d65f25f 100644 (file)
  */
 class SpecialAllmessages extends SpecialPage {
 
+       /**
+        * @var AllmessagesTablePager
+        */
+       protected $table;
+
        /**
         * Constructor
         */
@@ -42,37 +47,108 @@ class SpecialAllmessages extends SpecialPage {
         * @param $par Mixed: parameter passed to the page or null
         */
        public function execute( $par ) {
-               global $wgOut, $wgRequest;
+               $request = $this->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();
 
-               $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;
+
+       public $mLimitsShown;
+
+       /**
+        * @var Skin
+        */
+       protected $mSkin;
+
+       /**
+        * @var Language
+        */
+       public $lang;
+
+       /**
+        * @var null|bool
+        */
+       public $custom;
+
+       function __construct( $page, $conds, $langObj = null ) {
+               parent::__construct();
+               $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 $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');
+               }
+
+               $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 buildForm() {
                global $wgScript;
 
@@ -124,72 +200,33 @@ class SpecialAllmessages extends SpecialPage {
                                        Xml::openElement( 'select', array( 'id' => 'mw-allmessages-form-lang', 'name' => 'lang' ) );
 
                foreach( $languages as $lang => $name ) {
-                       $selected = $lang == $this->langCode;
+                       $selected = $lang == $this->langcode;
                        $out .= Xml::option( $lang . ' - ' . $name, $lang, $selected ) . "\n";
                }
                $out .= Xml::closeElement( 'select' ) .
                                "</td>\n
-                       </tr>
-                       <tr>\n
+                       </tr>" .
+
+                       '<tr>
+                               <td class="mw-label">' .
+                                       Xml::label( wfMsg( 'table_pager_limit_label'), 'mw-table_pager_limit_label' ) .
+                               '</td>
+                               <td class="mw-input">' .
+                                       $this->getLimitSelect() .
+                               '</td>
+                       <tr>
                                <td></td>
-                               <td>" .
+                               <td>' .
                                        Xml::submitButton( wfMsg( 'allmessages-filter-submit' ) ) .
                                "</td>\n
                        </tr>" .
+
                        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 {
-
-       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
-               $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 );
-
-               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');
-               }
-
-               $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( $descending ) {
                wfProfileIn( __METHOD__ );
@@ -202,18 +239,22 @@ class AllmessagesTablePager extends TablePager {
 
                // Normalise message names so they look like page titles
                $messageNames = array_map( array( $this->lang, 'ucfirst' ), $messageNames );
-               wfProfileIn( __METHOD__ );
 
+               wfProfileOut( __METHOD__ );
                return $messageNames;
        }
 
        /**
-        * 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 
+        * 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
         */
-       function getCustomisedStatuses( $messageNames ) {
+       public static function getCustomisedStatuses( $messageNames, $langcode = 'en', $foreign = false ) {
                wfProfileIn( __METHOD__ . '-db' );
 
                $dbr = wfGetDB( DB_SLAVE );
@@ -226,20 +267,19 @@ class AllmessagesTablePager extends TablePager {
                $xNames = array_flip( $messageNames );
 
                $pageFlags = $talkFlags = array();
-               
+
                foreach ( $res as $s ) {
                        if( $s->page_namespace == NS_MEDIAWIKI ) {
-                               if( $this->foreign ) {
+                               if( $foreign ) {
                                        $title = explode( '/', $s->page_title );
-                                       if( count( $title ) === 2 && $this->langcode == $title[1] 
-                                               && isset( $xNames[$title[0]] ) )
-                                       {
+                                       if( count( $title ) === 2 && $langcode == $title[1]
+                                               && isset( $xNames[$title[0]] ) ) {
                                                $pageFlags["{$title[0]}"] = true;
                                        }
                                } elseif( isset( $xNames[$s->page_title] ) ) {
                                        $pageFlags[$s->page_title] = true;
                                }
-                       } else if( $s->page_namespace == NS_MEDIAWIKI_TALK ){
+                       } elseif( $s->page_namespace == NS_MEDIAWIKI_TALK ){
                                $talkFlags[$s->page_title] = true;
                        }
                }
@@ -249,14 +289,15 @@ class AllmessagesTablePager extends TablePager {
                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 ) {
                $result = new FakeResultWrapper( array() );
 
                $messageNames = $this->getAllMessages( $descending );
-               $statuses = $this->getCustomisedStatuses( $messageNames );
+               $statuses = self::getCustomisedStatuses( $messageNames, $this->langcode, $this->foreign );
 
                $count = 0;
                foreach( $messageNames as $key ) {
@@ -264,17 +305,21 @@ class AllmessagesTablePager extends TablePager {
                        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'     => wfMsgGetKey( $key, /*useDB*/true, $this->langcode, false ),
-                                       'am_default'    => wfMsgGetKey( $key, /*useDB*/false, $this->langcode, false ),
+                                       'am_actual'     => $actual,
+                                       'am_default'    => $default,
                                        'am_customised' => $customised,
                                        'am_talk_exists' => isset( $statuses['talks'][$key] )
                                );
                                $count++;
                        }
-                       if( $count == $limit ) break;
+                       if( $count == $limit ) {
+                               break;
+                       }
                }
                return $result;
        }
@@ -330,7 +375,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 );
                }
@@ -367,7 +411,10 @@ class AllmessagesTablePager extends TablePager {
        }
 
        function getCellAttrs( $field, $value ){
-               if( $this->mCurrentRow->am_customised && $field == 'am_title' ){
+               global $wgBetterDirectionality;
+               if( $field != 'am_title' && $wgBetterDirectionality ) {
+                       return array( 'lang' => $this->langcode, 'dir' => $this->lang->getDir() );
+               } elseif( $this->mCurrentRow->am_customised && $field == 'am_title' ) {
                        return array( 'rowspan' => '2', 'class' => $field );
                } else {
                        return array( 'class' => $field );
@@ -381,15 +428,19 @@ class AllmessagesTablePager extends TablePager {
                        'am_default' => wfMsg( 'allmessagesdefault' )
                );
        }
+
        function getTitle() {
                return SpecialPage::getTitleFor( 'Allmessages', false );
        }
+
        function isFieldSortable( $x ){
                return false;
        }
+
        function getDefaultSort(){
                return '';
        }
+
        function getQueryInfo(){
                return '';
        }