X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialAllmessages.php;h=5ab48ddc2bb4620b7a7ce22ff2b62454399f18b9;hb=7cf8b3197c58b7c938e33f3eea2e119fa7cf8cf8;hp=4270d83af7a7de014baff4b740512aef8da82eff;hpb=6826aed67097ded0c9a2366920009505f10a528c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index 4270d83af7..5ab48ddc2b 100644
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -34,8 +34,6 @@ class SpecialAllmessages extends SpecialPage {
 	 */
 	protected $table;
 
-	protected $filter, $prefix, $langCode;
-
 	/**
 	 * Constructor
 	 */
@@ -49,39 +47,104 @@ 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' );
 		}
 
-		$wgOut->addModuleStyles( 'mediawiki.special' );
+		$out->addModuleStyles( 'mediawiki.special' );
 
-		$this->filter = $wgRequest->getVal( 'filter', 'all' );
-		$this->prefix = $wgRequest->getVal( 'prefix', '' );
+		$this->filter = $request->getVal( 'filter', 'all' );
+		$this->prefix = $request->getVal( 'prefix', '' );
 
 		$this->table = new AllmessagesTablePager(
 			$this,
 			array(),
-			wfGetLangObj( $wgRequest->getVal( 'lang', $par ) )
+			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;
 
@@ -89,35 +152,35 @@ 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::fieldset( $this->msg( 'allmessages-filter-legend' )->text() ) .
 			Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
 			Xml::openElement( 'table', array( 'class' => 'mw-allmessages-table' ) ) . "\n" .
 			'<tr>
 				<td class="mw-label">' .
-					Xml::label( wfMsg( 'allmessages-prefix' ), 'mw-allmessages-form-prefix' ) .
+					Xml::label( $this->msg( 'allmessages-prefix' )->text(), 'mw-allmessages-form-prefix' ) .
 				"</td>\n
 				<td class=\"mw-input\">" .
-					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' ) ) .
 				"</td>\n
 			</tr>
 			<tr>\n
 				<td class='mw-label'>" .
-					wfMsg( 'allmessages-filter' ) .
+					$this->msg( 'allmessages-filter' )->escaped() .
 				"</td>\n
 				<td class='mw-input'>" .
-					Xml::radioLabel( wfMsg( 'allmessages-filter-unmodified' ),
+					Xml::radioLabel( $this->msg( 'allmessages-filter-unmodified' )->text(),
 						'filter',
 						'unmodified',
 						'mw-allmessages-form-filter-unmodified',
 						( $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' )
 					) .
-					Xml::radioLabel( wfMsg( 'allmessages-filter-modified' ),
+					Xml::radioLabel( $this->msg( 'allmessages-filter-modified' )->text(),
 						'filter',
 						'modified',
 						'mw-allmessages-form-filter-modified',
@@ -127,94 +190,39 @@ class SpecialAllmessages extends SpecialPage {
 			</tr>
 			<tr>\n
 				<td class=\"mw-label\">" .
-					Xml::label( wfMsg( 'allmessages-language' ), 'mw-allmessages-form-lang' ) .
+					Xml::label( $this->msg( 'allmessages-language' )->text(), 'mw-allmessages-form-lang' ) .
 				"</td>\n
 				<td class=\"mw-input\">" .
 					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( $this->msg( 'table_pager_limit_label' )->text(), 'mw-table_pager_limit_label' ) .
+				'</td>
+				<td class="mw-input">' .
+					$this->getLimitSelect() .
+				'</td>
+			<tr>
 				<td></td>
-				<td>" .
-					Xml::submitButton( wfMsg( 'allmessages-filter-submit' ) ) .
+				<td>' .
+					Xml::submitButton( $this->msg( 'allmessages-filter-submit' )->text() ) .
 				"</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;
-
-	/**
-	 * @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 getAllMessages( $descending ) {
 		wfProfileIn( __METHOD__ );
@@ -241,8 +249,10 @@ class AllmessagesTablePager extends TablePager {
 	 * @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 );
@@ -257,18 +267,20 @@ class AllmessagesTablePager extends TablePager {
 		$pageFlags = $talkFlags = array();
 
 		foreach ( $res as $s ) {
-			if( $s->page_namespace == NS_MEDIAWIKI ) {
-				if( $foreign ) {
-					$title = explode( '/', $s->page_title );
-					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;
+			$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 ){
-				$talkFlags[$s->page_title] = true;
+			} 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;
 			}
 		}
 
@@ -313,24 +325,23 @@ class AllmessagesTablePager extends TablePager {
 	}
 
 	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" .
 			"<thead><tr>
 				<th rowspan=\"2\">" .
-					wfMsg( 'allmessagesname' ) . "
+					$this->msg( 'allmessagesname' )->escaped() . "
 				</th>
 				<th>" .
-					wfMsg( 'allmessagesdefault' ) .
+					$this->msg( 'allmessagesdefault' )->escaped() .
 				"</th>
 			</tr>\n
 			<tr>
 				<th>" .
-					wfMsg( 'allmessagescurrent' ) .
+					$this->msg( 'allmessagescurrent' )->escaped() .
 				"</th>
 			</tr></thead><tbody>\n";
 	}
 
 	function formatValue( $field, $value ){
-		global $wgLang;
 		switch( $field ){
 
 			case 'am_title' :
@@ -339,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 ( $this->mCurrentRow->am_talk_exists ) {
-					$talk = $this->mSkin->linkKnown( $talk , $this->talk );
+					$talk = Linker::linkKnown( $talk , $this->talk );
 				} else {
-					$talk = $this->mSkin->link(
+					$talk = Linker::link(
 						$talk,
 						$this->talk,
 						array(),
@@ -388,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;
 	}
@@ -401,16 +411,18 @@ 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()
 		);
 	}