X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPager.php;h=b91b061752968decf7741c1f63e2abd26f8273d9;hb=403f87be35e93a1cd205c619310b08f682dfc838;hp=7df84998110b67bf24e7bb2db614a2c12d84b4f5;hpb=695ec8ea93a30e2359b28de867970192ab288b94;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Pager.php b/includes/Pager.php index 7df8499811..b91b061752 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -50,14 +50,14 @@ interface Pager { * last page depending on the dir parameter. * * Subclassing the pager to implement concrete functionality should be fairly - * simple, please see the examples in PageHistory.php and - * SpecialIpblocklist.php. You just need to override formatRow(), + * simple, please see the examples in HistoryPage.php and + * SpecialBlockList.php. You just need to override formatRow(), * getQueryInfo() and getIndexField(). Don't forget to call the parent * constructor if you override it. * * @ingroup Pager */ -abstract class IndexPager implements Pager { +abstract class IndexPager extends ContextSource implements Pager { public $mRequest; public $mLimitsShown = array( 20, 50, 100, 250, 500 ); public $mDefaultLimit = 50; @@ -67,11 +67,17 @@ abstract class IndexPager implements Pager { public $mPastTheEndRow; /** - * The index to actually be used for ordering. This is a single string e- - * ven if multiple orderings are supported. + * The index to actually be used for ordering. This is a single column, + * for one ordering, even if multiple orderings are supported. */ protected $mIndexField; - /** For pages that support multiple types of ordering, which one to use. */ + /** + * An array of secondary columns to order by. These fields are not part of the offset. + * This is a column list for one ordering, even if multiple orderings are supported. + */ + protected $mExtraSortFields; + /** For pages that support multiple types of ordering, which one to use. + */ protected $mOrderType; /** * $mDefaultDirection gives the direction to use when sorting results: @@ -87,14 +93,22 @@ abstract class IndexPager implements Pager { public $mDefaultDirection; public $mIsBackwards; + /** True if the current result set is the first one */ + public $mIsFirst; + /** * Result object for the query. Warning: seek before use. + * + * @var ResultWrapper */ public $mResult; - public function __construct() { - global $wgRequest, $wgUser; - $this->mRequest = $wgRequest; + public function __construct( IContextSource $context = null ) { + if ( $context ) { + $this->setContext( $context ); + } + + $this->mRequest = $this->getRequest(); # NB: the offset is quoted, not validated. It is treated as an # arbitrary string to support the widest variety of index types. Be @@ -102,25 +116,33 @@ abstract class IndexPager implements Pager { $this->mOffset = $this->mRequest->getText( 'offset' ); # Use consistent behavior for the limit options - $this->mDefaultLimit = intval( $wgUser->getOption( 'rclimit' ) ); + $this->mDefaultLimit = intval( $this->getUser()->getOption( 'rclimit' ) ); list( $this->mLimit, /* $offset */ ) = $this->mRequest->getLimitOffset(); $this->mIsBackwards = ( $this->mRequest->getVal( 'dir' ) == 'prev' ); $this->mDb = wfGetDB( DB_SLAVE ); - $index = $this->getIndexField(); + $index = $this->getIndexField(); // column to sort on + $extraSort = $this->getExtraSortFields(); // extra columns to sort on for query planning $order = $this->mRequest->getVal( 'order' ); if( is_array( $index ) && isset( $index[$order] ) ) { $this->mOrderType = $order; $this->mIndexField = $index[$order]; + $this->mExtraSortFields = isset( $extraSort[$order] ) + ? (array)$extraSort[$order] + : array(); } elseif( is_array( $index ) ) { # First element is the default reset( $index ); list( $this->mOrderType, $this->mIndexField ) = each( $index ); + $this->mExtraSortFields = isset( $extraSort[$this->mOrderType] ) + ? (array)$extraSort[$this->mOrderType] + : array(); } else { # $index is not an array $this->mOrderType = null; $this->mIndexField = $index; + $this->mExtraSortFields = (array)$extraSort; } if( !isset( $this->mDefaultDirection ) ) { @@ -136,7 +158,7 @@ abstract class IndexPager implements Pager { * has been kept minimal to make it overridable if necessary, to allow for * result sets formed from multiple DB queries. */ - function doQuery() { + public function doQuery() { # Use the child class name for profiling $fname = __METHOD__ . ' (' . get_class( $this ) . ')'; wfProfileIn( $fname ); @@ -145,7 +167,11 @@ abstract class IndexPager implements Pager { # Plus an extra row so that we can tell the "next" link should be shown $queryLimit = $this->mLimit + 1; - $this->mResult = $this->reallyDoQuery( $this->mOffset, $queryLimit, $descending ); + $this->mResult = $this->reallyDoQuery( + $this->mOffset, + $queryLimit, + $descending + ); $this->extractResultInfo( $this->mOffset, $queryLimit, $this->mResult ); $this->mQueryDone = true; @@ -154,22 +180,22 @@ abstract class IndexPager implements Pager { wfProfileOut( $fname ); } - + /** - * Return the result wrapper. + * @return ResultWrapper The result wrapper. */ function getResult() { return $this->mResult; } - + /** - * Set the offset from an other source than $wgRequest + * Set the offset from an other source than the request */ function setOffset( $offset ) { $this->mOffset = $offset; } /** - * Set the limit from an other source than $wgRequest + * Set the limit from an other source than the request */ function setLimit( $limit ) { $this->mLimit = $limit; @@ -178,12 +204,20 @@ abstract class IndexPager implements Pager { /** * Extract some useful data from the result object for use by * the navigation bar, put it into $this + * + * @param $offset String: index offset, inclusive + * @param $limit Integer: exact query limit + * @param $res ResultWrapper */ function extractResultInfo( $offset, $limit, ResultWrapper $res ) { $numRows = $res->numRows(); if ( $numRows ) { + # Remove any table prefix from index field + $parts = explode( '.', $this->mIndexField ); + $indexColumn = end( $parts ); + $row = $res->fetchRow(); - $firstIndex = $row[$this->mIndexField]; + $firstIndex = $row[$indexColumn]; # Discard the extra result row if there is one if ( $numRows > $this->mLimit && $numRows > 1 ) { @@ -193,7 +227,7 @@ abstract class IndexPager implements Pager { $this->mPastTheEndIndex = $this->mPastTheEndRow->$indexField; $res->seek( $numRows - 2 ); $row = $res->fetchRow(); - $lastIndex = $row[$this->mIndexField]; + $lastIndex = $row[$indexColumn]; } else { $this->mPastTheEndRow = null; # Setting indexes to an empty string means that they will be @@ -203,7 +237,7 @@ abstract class IndexPager implements Pager { $this->mPastTheEndIndex = ''; $res->seek( $numRows - 1 ); $row = $res->fetchRow(); - $lastIndex = $row[$this->mIndexField]; + $lastIndex = $row[$indexColumn]; } } else { $firstIndex = ''; @@ -225,28 +259,42 @@ abstract class IndexPager implements Pager { } } + /** + * Get some text to go in brackets in the "function name" part of the SQL comment + * + * @return String + */ + function getSqlComment() { + return get_class( $this ); + } + /** * Do a query with specified parameters, rather than using the object * context * - * @param string $offset Index offset, inclusive - * @param integer $limit Exact query limit - * @param boolean $descending Query direction, false for ascending, true for descending + * @param $offset String: index offset, inclusive + * @param $limit Integer: exact query limit + * @param $descending Boolean: query direction, false for ascending, true for descending * @return ResultWrapper */ function reallyDoQuery( $offset, $limit, $descending ) { - $fname = __METHOD__ . ' (' . get_class( $this ) . ')'; + $fname = __METHOD__ . ' (' . $this->getSqlComment() . ')'; $info = $this->getQueryInfo(); $tables = $info['tables']; $fields = $info['fields']; $conds = isset( $info['conds'] ) ? $info['conds'] : array(); $options = isset( $info['options'] ) ? $info['options'] : array(); $join_conds = isset( $info['join_conds'] ) ? $info['join_conds'] : array(); + $sortColumns = array_merge( array( $this->mIndexField ), $this->mExtraSortFields ); if ( $descending ) { - $options['ORDER BY'] = $this->mIndexField; + $options['ORDER BY'] = implode( ',', $sortColumns ); $operator = '>'; } else { - $options['ORDER BY'] = $this->mIndexField . ' DESC'; + $orderBy = array(); + foreach ( $sortColumns as $col ) { + $orderBy[] = $col . ' DESC'; + } + $options['ORDER BY'] = implode( ',', $orderBy ); $operator = '<'; } if ( $offset != '' ) { @@ -260,13 +308,15 @@ abstract class IndexPager implements Pager { /** * Pre-process results; useful for performing batch existence checks, etc. * - * @param ResultWrapper $result Result wrapper + * @param $result ResultWrapper */ protected function preprocessResults( $result ) {} /** * Get the formatted result list. Calls getStartBody(), formatRow() and * getEndBody(), concatenates the results and returns them. + * + * @return String */ function getBody() { if ( !$this->mQueryDone ) { @@ -299,6 +349,11 @@ abstract class IndexPager implements Pager { /** * Make a self-link + * + * @param $text String: text displayed on the link + * @param $query Array: associative array of paramter to be in the query string + * @param $type String: value of the "rel" attribute + * @return String: HTML fragment */ function makeLink($text, $query = null, $type=null) { if ( $query === null ) { @@ -314,13 +369,19 @@ abstract class IndexPager implements Pager { if( $type ) { $attrs['class'] = "mw-{$type}link"; } - return $this->getSkin()->link( $this->getTitle(), $text, - $attrs, $query + $this->getDefaultQuery(), array('noclasses','known') ); + return Linker::linkKnown( + $this->getTitle(), + $text, + $attrs, + $query + $this->getDefaultQuery() + ); } /** * Hook into getBody(), allows text to be inserted at the start. This * will be called even if there are no rows in the result set. + * + * @return String */ function getStartBody() { return ''; @@ -328,6 +389,8 @@ abstract class IndexPager implements Pager { /** * Hook into getBody() for the end of the list + * + * @return String */ function getEndBody() { return ''; @@ -336,38 +399,23 @@ abstract class IndexPager implements Pager { /** * Hook into getBody(), for the bit between the start and the * end when there are no rows + * + * @return String */ function getEmptyBody() { return ''; } - /** - * Title used for self-links. Override this if you want to be able to - * use a title other than $wgTitle - */ - function getTitle() { - return $GLOBALS['wgTitle']; - } - - /** - * Get the current skin. This can be overridden if necessary. - */ - function getSkin() { - if ( !isset( $this->mSkin ) ) { - global $wgUser; - $this->mSkin = $wgUser->getSkin(); - } - return $this->mSkin; - } - /** * Get an array of query parameters that should be put into self-links. * By default, all parameters passed in the URL are used, except for a * short blacklist. + * + * @return Associative array */ function getDefaultQuery() { if ( !isset( $this->mDefaultQuery ) ) { - $this->mDefaultQuery = $_GET; + $this->mDefaultQuery = $this->getRequest()->getQueryValues(); unset( $this->mDefaultQuery['title'] ); unset( $this->mDefaultQuery['dir'] ); unset( $this->mDefaultQuery['offset'] ); @@ -381,6 +429,8 @@ abstract class IndexPager implements Pager { /** * Get the number of rows in the result set + * + * @return Integer */ function getNumRows() { if ( !$this->mQueryDone ) { @@ -391,6 +441,8 @@ abstract class IndexPager implements Pager { /** * Get a URL query array for the prev, next, first and last links. + * + * @return Array */ function getPagingQueries() { if ( !$this->mQueryDone ) { @@ -404,7 +456,11 @@ abstract class IndexPager implements Pager { $prev = false; $first = false; } else { - $prev = array( 'dir' => 'prev', 'offset' => $this->mFirstShown, 'limit' => $urlLimit ); + $prev = array( + 'dir' => 'prev', + 'offset' => $this->mFirstShown, + 'limit' => $urlLimit + ); $first = array( 'limit' => $urlLimit ); } if ( $this->mIsLast ) { @@ -414,7 +470,25 @@ abstract class IndexPager implements Pager { $next = array( 'offset' => $this->mLastShown, 'limit' => $urlLimit ); $last = array( 'dir' => 'prev', 'limit' => $urlLimit ); } - return array( 'prev' => $prev, 'next' => $next, 'first' => $first, 'last' => $last ); + return array( + 'prev' => $prev, + 'next' => $next, + 'first' => $first, + 'last' => $last + ); + } + + /** + * Returns whether to show the "navigation bar" + * + * @return Boolean + */ + function isNavigationBarShown() { + if ( !$this->mQueryDone ) { + $this->doQuery(); + } + // Hide navigation by default if there is nothing to page + return !($this->mIsFirst && $this->mIsLast); } /** @@ -422,13 +496,19 @@ abstract class IndexPager implements Pager { * will be used. If there is no such item, the unlinked text from * $linkTexts will be used. Both $linkTexts and $disabledTexts are arrays * of HTML. + * + * @return Array */ function getPagingLinks( $linkTexts, $disabledTexts = array() ) { $queries = $this->getPagingQueries(); $links = array(); foreach ( $queries as $type => $query ) { if ( $query !== false ) { - $links[$type] = $this->makeLink( $linkTexts[$type], $queries[$type], $type ); + $links[$type] = $this->makeLink( + $linkTexts[$type], + $queries[$type], + $type + ); } elseif ( isset( $disabledTexts[$type] ) ) { $links[$type] = $disabledTexts[$type]; } else { @@ -439,7 +519,6 @@ abstract class IndexPager implements Pager { } function getLimitLinks() { - global $wgLang; $links = array(); if ( $this->mIsBackwards ) { $offset = $this->mPastTheEndIndex; @@ -447,8 +526,11 @@ abstract class IndexPager implements Pager { $offset = $this->mOffset; } foreach ( $this->mLimitsShown as $limit ) { - $links[] = $this->makeLink( $wgLang->formatNum( $limit ), - array( 'offset' => $offset, 'limit' => $limit ), 'num' ); + $links[] = $this->makeLink( + $this->getLang()->formatNum( $limit ), + array( 'offset' => $offset, 'limit' => $limit ), + 'num' + ); } return $links; } @@ -457,6 +539,9 @@ abstract class IndexPager implements Pager { * Abstract formatting function. This should return an HTML string * representing the result row $row. Rows will be concatenated and * returned by getBody() + * + * @param $row Object: database row + * @return String */ abstract function formatRow( $row ); @@ -469,6 +554,8 @@ abstract class IndexPager implements Pager { * conds => WHERE conditions * options => option array * join_conds => JOIN conditions + * + * @return Array */ abstract function getQueryInfo(); @@ -481,9 +568,29 @@ abstract class IndexPager implements Pager { * * Needless to say, it's really not a good idea to use a non-unique index * for this! That won't page right. + * + * @return string|Array */ abstract function getIndexField(); + /** + * This function should be overridden to return the names of secondary columns + * to order by in addition to the column in getIndexField(). These fields will + * not be used in the pager offset or in any links for users. + * + * If getIndexField() returns an array of 'querykey' => 'indexfield' pairs then + * this must return a corresponding array of 'querykey' => array( fields...) pairs + * in order for a request with &count=querykey to use array( fields...) to sort. + * + * This is useful for pagers that GROUP BY a unique column (say page_id) + * and ORDER BY another (say page_len). Using GROUP BY and ORDER BY both on + * page_len,page_id avoids temp tables (given a page_len index). This would + * also work if page_id was non-unique but we had a page_len,page_id index. + * + * @return Array + */ + protected function getExtraSortFields() { return array(); } + /** * Return the default sorting direction: false for ascending, true for de- * scending. You can also have an associative array of ordertype => dir, @@ -500,6 +607,8 @@ abstract class IndexPager implements Pager { * $this->mDefaultDirection member variable. That's the default for this * particular instantiation, which is a single value. This is the set of * all defaults for the class. + * + * @return Boolean */ protected function getDefaultDirections() { return false; } } @@ -515,28 +624,39 @@ abstract class AlphabeticPager extends IndexPager { * didn't want to do class magic as may be still revamped */ function getNavigationBar() { - global $wgLang; - - if ( $this->mIsFirst && $this->mIsLast ) return ''; + if ( !$this->isNavigationBarShown() ) return ''; if( isset( $this->mNavigationBar ) ) { return $this->mNavigationBar; } + $lang = $this->getLang(); + $opts = array( 'parsemag', 'escapenoentities' ); $linkTexts = array( - 'prev' => wfMsgExt( 'prevn', $opts, $wgLang->formatNum( $this->mLimit ) ), - 'next' => wfMsgExt( 'nextn', $opts, $wgLang->formatNum($this->mLimit ) ), + 'prev' => wfMsgExt( + 'prevn', + $opts, + $lang->formatNum( $this->mLimit ) + ), + 'next' => wfMsgExt( + 'nextn', + $opts, + $lang->formatNum($this->mLimit ) + ), 'first' => wfMsgExt( 'page_first', $opts ), 'last' => wfMsgExt( 'page_last', $opts ) ); $pagingLinks = $this->getPagingLinks( $linkTexts ); $limitLinks = $this->getLimitLinks(); - $limits = $wgLang->pipeList( $limitLinks ); + $limits = $lang->pipeList( $limitLinks ); $this->mNavigationBar = - "(" . $wgLang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " . + "(" . $lang->pipeList( + array( $pagingLinks['first'], + $pagingLinks['last'] ) + ) . ") " . wfMsgHtml( 'viewprevnext', $pagingLinks['prev'], $pagingLinks['next'], $limits ); @@ -577,7 +697,8 @@ abstract class AlphabeticPager extends IndexPager { * enabling each one in getNavigationBar. The return type is an associa- * tive array whose keys must exactly match the keys of the array returned * by getIndexField(), and whose values are message keys. - * @return array + * + * @return Array */ protected function getOrderTypeMessages() { return null; @@ -593,35 +714,46 @@ abstract class ReverseChronologicalPager extends IndexPager { public $mYear; public $mMonth; - function __construct() { - parent::__construct(); - } - function getNavigationBar() { - global $wgLang; - - if ( $this->mIsFirst && $this->mIsLast ) return ''; + if ( !$this->isNavigationBarShown() ) { + return ''; + } if ( isset( $this->mNavigationBar ) ) { return $this->mNavigationBar; } - $nicenumber = $wgLang->formatNum( $this->mLimit ); + + $nicenumber = $this->getLang()->formatNum( $this->mLimit ); $linkTexts = array( - 'prev' => wfMsgExt( 'pager-newer-n', array( 'parsemag' ), $nicenumber ), - 'next' => wfMsgExt( 'pager-older-n', array( 'parsemag' ), $nicenumber ), + 'prev' => wfMsgExt( + 'pager-newer-n', + array( 'parsemag', 'escape' ), + $nicenumber + ), + 'next' => wfMsgExt( + 'pager-older-n', + array( 'parsemag', 'escape' ), + $nicenumber + ), 'first' => wfMsgHtml( 'histlast' ), 'last' => wfMsgHtml( 'histfirst' ) ); $pagingLinks = $this->getPagingLinks( $linkTexts ); $limitLinks = $this->getLimitLinks(); - $limits = $wgLang->pipeList( $limitLinks ); - - $this->mNavigationBar = "({$pagingLinks['first']}" . wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "{$pagingLinks['last']}) " . - wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits); + $limits = $this->getLang()->pipeList( $limitLinks ); + + $this->mNavigationBar = "({$pagingLinks['first']}" . + wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . + "{$pagingLinks['last']}) " . + wfMsgHTML( + 'viewprevnext', + $pagingLinks['prev'], $pagingLinks['next'], + $limits + ); return $this->mNavigationBar; } - + function getDateCond( $year, $month ) { $year = intval($year); $month = intval($month); @@ -678,15 +810,18 @@ abstract class TablePager extends IndexPager { var $mSort; var $mCurrentRow; - function __construct() { - global $wgRequest; - $this->mSort = $wgRequest->getText( 'sort' ); + function __construct( IContextSource $context = null ) { + if ( $context ) { + $this->setContext( $context ); + } + + $this->mSort = $this->getRequest()->getText( 'sort' ); if ( !array_key_exists( $this->mSort, $this->getFieldNames() ) ) { $this->mSort = $this->getDefaultSort(); } - if ( $wgRequest->getBool( 'asc' ) ) { + if ( $this->getRequest()->getBool( 'asc' ) ) { $this->mDefaultDirection = false; - } elseif ( $wgRequest->getBool( 'desc' ) ) { + } elseif ( $this->getRequest()->getBool( 'desc' ) ) { $this->mDefaultDirection = true; } /* Else leave it at whatever the class default is */ @@ -698,13 +833,13 @@ abstract class TablePager extends IndexPager { $tableClass = htmlspecialchars( $this->getTableClass() ); $sortClass = htmlspecialchars( $this->getSortHeaderClass() ); - $s = "\n"; + $s = "
\n"; $fields = $this->getFieldNames(); # Make table header foreach ( $fields as $field => $name ) { if ( strval( $name ) == '' ) { - $s .= "\n"; + $s .= "\n"; } elseif ( $this->isFieldSortable( $field ) ) { $query = array( 'sort' => $field, 'limit' => $this->mLimit ); if ( $field == $this->mSort ) { @@ -712,13 +847,13 @@ abstract class TablePager extends IndexPager { # Prepare a link that goes in the other sort order if ( $this->mDefaultDirection ) { # Descending - $image = 'Arr_u.png'; + $image = 'Arr_d.png'; $query['asc'] = '1'; $query['desc'] = ''; $alt = htmlspecialchars( wfMsg( 'descending_abbrev' ) ); } else { # Ascending - $image = 'Arr_d.png'; + $image = 'Arr_u.png'; $query['asc'] = ''; $query['desc'] = '1'; $alt = htmlspecialchars( wfMsg( 'ascending_abbrev' ) ); @@ -750,18 +885,16 @@ abstract class TablePager extends IndexPager { } function formatRow( $row ) { - $rowClass = htmlspecialchars( $this->getRowClass( $row ) ); - $s = "\n"; + $this->mCurrentRow = $row; # In case formatValue etc need to know + $s = Xml::openElement( 'tr', $this->getRowAttrs($row) ); $fieldNames = $this->getFieldNames(); - $this->mCurrentRow = $row; # In case formatValue needs to know foreach ( $fieldNames as $field => $name ) { $value = isset( $row->$field ) ? $row->$field : null; $formatted = strval( $this->formatValue( $field, $value ) ); if ( $formatted == '' ) { - $formatted = ' '; + $formatted = ' '; } - $class = 'TablePager_col_' . htmlspecialchars( $field ); - $s .= "\n"; + $s .= Xml::tags( 'td', $this->getCellAttrs( $field, $value ), $formatted ); } $s .= "\n"; return $s; @@ -769,12 +902,43 @@ abstract class TablePager extends IndexPager { /** * Get a class name to be applied to the given row. - * @param object $row The database result row + * + * @param $row Object: the database result row + * @return String */ - function getRowClass($row) { + function getRowClass( $row ) { return ''; } + /** + * Get attributes to be applied to the given row. + * + * @param $row Object: the database result row + * @return Associative array + */ + function getRowAttrs( $row ) { + $class = $this->getRowClass( $row ); + if ( $class === '' ) { + // Return an empty array to avoid clutter in HTML like class="" + return array(); + } else { + return array( 'class' => $this->getRowClass( $row ) ); + } + } + + /** + * Get any extra attributes to be applied to the given cell. Don't + * take this as an excuse to hardcode styles; use classes and + * CSS instead. Row context is available in $this->mCurrentRow + * + * @param $field The column + * @param $value The cell contents + * @return Associative array + */ + function getCellAttrs( $field, $value ) { + return array( 'class' => 'TablePager_col_' . $field ); + } + function getIndexField() { return $this->mSort; } @@ -795,7 +959,12 @@ abstract class TablePager extends IndexPager { * A navigation bar with images */ function getNavigationBar() { - global $wgStylePath, $wgContLang; + global $wgStylePath; + + if ( !$this->isNavigationBarShown() ) { + return ''; + } + $path = "$wgStylePath/common/images"; $labels = array( 'first' => 'table_pager_first', @@ -804,32 +973,37 @@ abstract class TablePager extends IndexPager { 'last' => 'table_pager_last', ); $images = array( - 'first' => $wgContLang->isRTL() ? 'arrow_last_25.png' : 'arrow_first_25.png', - 'prev' => $wgContLang->isRTL() ? 'arrow_right_25.png' : 'arrow_left_25.png', - 'next' => $wgContLang->isRTL() ? 'arrow_left_25.png' : 'arrow_right_25.png', - 'last' => $wgContLang->isRTL() ? 'arrow_first_25.png' : 'arrow_last_25.png', + 'first' => 'arrow_first_25.png', + 'prev' => 'arrow_left_25.png', + 'next' => 'arrow_right_25.png', + 'last' => 'arrow_last_25.png', ); $disabledImages = array( - 'first' => $wgContLang->isRTL() ? 'arrow_disabled_last_25.png' : 'arrow_disabled_first_25.png', - 'prev' => $wgContLang->isRTL() ? 'arrow_disabled_right_25.png' : 'arrow_disabled_left_25.png', - 'next' => $wgContLang->isRTL() ? 'arrow_disabled_left_25.png' : 'arrow_disabled_right_25.png', - 'last' => $wgContLang->isRTL() ? 'arrow_disabled_first_25.png' : 'arrow_disabled_last_25.png', + 'first' => 'arrow_disabled_first_25.png', + 'prev' => 'arrow_disabled_left_25.png', + 'next' => 'arrow_disabled_right_25.png', + 'last' => 'arrow_disabled_last_25.png', ); + if( $this->getLang()->isRTL() ) { + $keys = array_keys( $labels ); + $images = array_combine( $keys, array_reverse( $images ) ); + $disabledImages = array_combine( $keys, array_reverse( $disabledImages ) ); + } $linkTexts = array(); $disabledTexts = array(); foreach ( $labels as $type => $label ) { $msgLabel = wfMsgHtml( $label ); - $linkTexts[$type] = "\"$msgLabel\"/
$msgLabel"; - $disabledTexts[$type] = "\"$msgLabel\"/
$msgLabel"; + $linkTexts[$type] = "\"$msgLabel\"/
$msgLabel"; + $disabledTexts[$type] = "\"$msgLabel\"/
$msgLabel"; } $links = $this->getPagingLinks( $linkTexts, $disabledTexts ); $navClass = htmlspecialchars( $this->getNavClass() ); - $s = "
  
$formatted
\n"; - $cellAttrs = 'valign="top" align="center" width="' . 100 / count( $links ) . '%"'; + $s = "
\n"; + $width = 100 / count( $links ) . '%'; foreach ( $labels as $type => $label ) { - $s .= "\n"; + $s .= "\n"; } $s .= "
{$links[$type]}{$links[$type]}
\n"; return $s; @@ -837,27 +1011,44 @@ abstract class TablePager extends IndexPager { /** * Get a "; - foreach ( $this->mLimitsShown as $limit ) { - $selected = $limit == $this->mLimit ? 'selected="selected"' : ''; - $formattedLimit = $wgLang->formatNum( $limit ); - $s .= "\n"; + # Add the current limit from the query string + # to avoid that the limit is lost after clicking Go next time + if ( !in_array( $this->mLimit, $this->mLimitsShown ) ) { + $this->mLimitsShown[] = $this->mLimit; + sort( $this->mLimitsShown ); } - $s .= ""; + $s = Html::openElement( 'select', array( 'name' => 'limit' ) ) . "\n"; + foreach ( $this->mLimitsShown as $key => $value ) { + # The pair is either $index => $limit, in which case the $value + # will be numeric, or $limit => $text, in which case the $value + # will be a string. + if( is_int( $value ) ){ + $limit = $value; + $text = $this->getLang()->formatNum( $limit ); + } else { + $limit = $key; + $text = $value; + } + $s .= Xml::option( $text, $limit, $limit == $this->mLimit ) . "\n"; + } + $s .= Html::closeElement( 'select' ); return $s; } /** * Get elements for use in a method="get" form. - * Resubmits all defined elements of the $_GET array, except for a + * Resubmits all defined elements of the query string, except for a * blacklist, passed in the $blacklist parameter. + * + * @return String: HTML fragment */ function getHiddenFields( $blacklist = array() ) { $blacklist = (array)$blacklist; - $query = $_GET; + $query = $this->getRequest()->getQueryValues(); foreach ( $blacklist as $name ) { unset( $query[$name] ); } @@ -872,36 +1063,51 @@ abstract class TablePager extends IndexPager { /** * Get a form containing a limit selection dropdown + * + * @return String: HTML fragment */ function getLimitForm() { + global $wgScript; + + return Xml::openElement( + 'form', + array( + 'method' => 'get', + 'action' => $wgScript + ) ) . "\n" . $this->getLimitDropdown() . "\n"; + } + + /** + * Gets a limit selection dropdown + * + * @return string + */ + function getLimitDropdown() { # Make the select with some explanatory text - $url = $this->getTitle()->escapeLocalURL(); $msgSubmit = wfMsgHtml( 'table_pager_limit_submit' ); - return - "
" . - wfMsgHtml( 'table_pager_limit', $this->getLimitSelect() ) . + + return wfMsgHtml( 'table_pager_limit', $this->getLimitSelect() ) . "\n\n" . - $this->getHiddenFields( array('limit','title') ) . - "
\n"; + $this->getHiddenFields( array( 'limit' ) ); } /** * Return true if the named field should be sortable by the UI, false * otherwise * - * @param string $field + * @param $field String */ abstract function isFieldSortable( $field ); /** * Format a table cell. The return value should be HTML, but use an empty - * string not   for empty cells. Do not include the and . + * string not   for empty cells. Do not include the and . * * The current result row is available as $this->mCurrentRow, in case you * need more context. * - * @param string $name The database field name - * @param string $value The value retrieved from the database + * @param $name String: the database field name + * @param $value String: the value retrieved from the database */ abstract function formatValue( $name, $value );