X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=3c7d89e2501cf49accbf8f254afef3f640e8986f;hb=3d0abce217b73d9e3a0ae79d205cf7c10d957873;hp=2b6a4c1be119e731ca252b9ea5dcd9084195f174;hpb=eee4d13325626f966be8b3e14a4468177e84b918;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 2b6a4c1be1..3c7d89e250 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -1,692 +1,100 @@
getVal( 'diff' );
- $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
-
- if ( isset( $diff ) && $diffOnly )
- return parent::view();
-
- if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) )
- return;
-
- if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
- $this->openShowCategory();
- }
-
- parent::view();
-
- if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
- $this->closeShowCategory();
- }
- }
-
- /**
- * Don't return a 404 for categories in use.
- */
- function hasViewableContent() {
- if ( parent::hasViewableContent() ) {
- return true;
- } else {
- $cat = Category::newFromTitle( $this->mTitle );
- return $cat->getId() != 0;
- }
- }
-
- function openShowCategory() {
- # For overloading
- }
-
- function closeShowCategory() {
- global $wgOut, $wgRequest, $wgExperimentalCategorySort;
-
- if ( $wgExperimentalCategorySort ) {
- $from = $until = array();
- foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
- $from[$type] = $wgRequest->getVal( "{$type}from" );
- $until[$type] = $wgRequest->getVal( "{$type}until" );
- }
- } else {
- $from = $wgRequest->getVal( 'from' );
- $until = $wgRequest->getVal( 'until' );
- }
-
- $viewer = new CategoryViewer( $this->mTitle, $from, $until, $wgRequest->getValues() );
- $wgOut->addHTML( $viewer->getHTML() );
- }
-}
-
-class CategoryViewer {
- var $title, $limit, $from, $until,
- $articles, $articles_start_char,
- $children, $children_start_char,
- $showGallery, $gallery,
- $skin;
- # Category object for this page
- private $cat;
- # The original query array, to be used in generating paging links.
- private $query;
-
- function __construct( $title, $from = '', $until = '', $query = array() ) {
- global $wgCategoryPagingLimit;
- $this->title = $title;
- $this->from = $from;
- $this->until = $until;
- $this->limit = $wgCategoryPagingLimit;
- $this->cat = Category::newFromTitle( $title );
- $this->query = $query;
- }
-
- /**
- * Format the category data list.
- *
- * @return string HTML output
- * @private
- */
- function getHTML() {
- global $wgOut, $wgCategoryMagicGallery, $wgContLang;
- wfProfileIn( __METHOD__ );
-
- $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery;
-
- $this->clearCategoryState();
- $this->doCategoryQuery();
- $this->finaliseCategoryState();
-
- $r = $this->getSubcategorySection() .
- $this->getPagesSection() .
- $this->getImageSection();
-
- if ( $r == '' ) {
- // If there is no category content to display, only
- // show the top part of the navigation links.
- // FIXME: cannot be completely suppressed because it
- // is unknown if 'until' or 'from' makes this
- // give 0 results.
- $r = $r . $this->getCategoryTop();
- } else {
- $r = $this->getCategoryTop() .
- $r .
- $this->getCategoryBottom();
- }
-
- // Give a proper message if category is empty
- if ( $r == '' ) {
- $r = wfMsgExt( 'category-empty', array( 'parse' ) );
- }
-
- wfProfileOut( __METHOD__ );
- return $wgContLang->convert( $r );
- }
-
- function clearCategoryState() {
- $this->articles = array();
- $this->articles_start_char = array();
- $this->children = array();
- $this->children_start_char = array();
- if ( $this->showGallery ) {
- $this->gallery = new ImageGallery();
- $this->gallery->setHideBadImages();
- }
- }
-
- function getSkin() {
- if ( !$this->skin ) {
- global $wgUser;
- $this->skin = $wgUser->getSkin();
- }
- return $this->skin;
- }
+ # Subclasses can change this to override the viewer class.
+ protected $mCategoryViewerClass = 'CategoryViewer';
/**
- * Add a subcategory to the internal lists, using a Category object
+ * @param $title Title
+ * @return WikiCategoryPage
*/
- function addSubcategoryObject( $cat, $sortkey, $pageLength ) {
- $title = $cat->getTitle();
- $this->addSubcategory( $title, $sortkey, $pageLength );
+ protected function newPage( Title $title ) {
+ // Overload mPage with a category-specific page
+ return new WikiCategoryPage( $title );
}
/**
- * Add a subcategory to the internal lists, using a title object
- * @deprecated kept for compatibility, please use addSubcategoryObject instead
+ * Constructor from a page id
+ * @param $id Int article ID to load
+ * @return CategoryPage|null
*/
- function addSubcategory( $title, $sortkey, $pageLength ) {
- // Subcategory; strip the 'Category' namespace from the link text.
- $this->children[] = $this->getSkin()->link(
- $title,
- null,
- array(),
- array(),
- array( 'known', 'noclasses' )
- );
-
- $this->children_start_char[] = $this->getSubcategorySortChar( $title, $sortkey );
- }
-
- /**
- * Get the character to be used for sorting subcategories.
- * If there's a link from Category:A to Category:B, the sortkey of the resulting
- * entry in the categorylinks table is Category:A, not A, which it SHOULD be.
- * Workaround: If sortkey == "Category:".$title, than use $title for sorting,
- * else use sortkey...
- */
- function getSubcategorySortChar( $title, $sortkey ) {
- global $wgContLang, $wgExperimentalCategorySort;
-
- if ( $title->getPrefixedText() == $sortkey ) {
- $word = $title->getDBkey();
- } else {
- $word = $sortkey;
- }
-
- if ( $wgExperimentalCategorySort ) {
- $firstChar = $wgContLang->firstLetterForLists( $word );
- } else {
- $firstChar = $wgContLang->firstChar( $word );
- }
-
- return $wgContLang->convert( $firstChar );
- }
-
- /**
- * Add a page in the image namespace
- */
- function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) {
- if ( $this->showGallery ) {
- global $wgExperimentalCategorySort;
- if ( $wgExperimentalCategorySort ) {
- $flip = $this->flip['file'];
- } else {
- $flip = $this->flip;
- }
- if ( $flip ) {
- $this->gallery->insert( $title );
- } else {
- $this->gallery->add( $title );
- }
- } else {
- $this->addPage( $title, $sortkey, $pageLength, $isRedirect );
- }
- }
-
- /**
- * Add a miscellaneous page
- */
- function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
- global $wgContLang, $wgExperimentalCategorySort;
- $this->articles[] = $isRedirect
- ? '' .
- $this->getSkin()->link(
- $title,
- null,
- array(),
- array(),
- array( 'known', 'noclasses' )
- ) . ''
- : $this->getSkin()->link( $title );
-
- if ( $wgExperimentalCategorySort ) {
- $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstLetterForLists( $sortkey ) );
- } else {
- $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) );
- }
- }
-
- function finaliseCategoryState() {
- global $wgExperimentalCategorySort;
- if ( ( !$wgExperimentalCategorySort && $this->flip )
- || ( $wgExperimentalCategorySort && $this->flip['subcat'] ) ) {
- $this->children = array_reverse( $this->children );
- $this->children_start_char = array_reverse( $this->children_start_char );
- }
- if ( ( !$wgExperimentalCategorySort && $this->flip )
- || ( $wgExperimentalCategorySort && $this->flip['page'] ) ) {
- $this->articles = array_reverse( $this->articles );
- $this->articles_start_char = array_reverse( $this->articles_start_char );
- }
+ public static function newFromID( $id ) {
+ $t = Title::newFromID( $id );
+ # @todo FIXME: Doesn't inherit right
+ return $t == null ? null : new self( $t );
+ # return $t == null ? null : new static( $t ); // PHP 5.3
}
- function doCategoryQuery() {
- global $wgExperimentalCategorySort, $wgContLang;
-
- $dbr = wfGetDB( DB_SLAVE, 'category' );
-
- $tables = array( 'page', 'categorylinks', 'category' );
- $fields = array( 'page_title', 'page_namespace', 'page_len',
- 'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title',
- 'cat_subcats', 'cat_pages', 'cat_files' );
- $conds = array( 'cl_to' => $this->title->getDBkey() );
- $opts = array(
- 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
- 'LIMIT' => $this->limit + 1,
- );
- $joins = array( 'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ),
- 'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) );
-
- if ( $wgExperimentalCategorySort ) {
- # Copy-pasted from below, but that's okay, because the stuff below
- # will be deleted when this becomes the default.
- $this->nextPage = array(
- 'page' => null,
- 'subcat' => null,
- 'file' => null,
- );
- $this->flip = array( 'page' => false, 'subcat' => false, 'file' => false );
-
- foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
- # Get the sortkeys for start/end, if applicable. Note that if
- # the collation in the database differs from the one
- # $wgContLang is using, pagination might go totally haywire.
- $extraConds = array( 'cl_type' => $type );
- if ( $this->from[$type] !== null ) {
- $extraConds[] = 'cl_sortkey >= '
- . $dbr->addQuotes( $wgContLang->convertToSortkey( $this->from[$type] ) );
- } elseif ( $this->until[$type] !== null ) {
- $extraConds[] = 'cl_sortkey < '
- . $dbr->addQuotes( $wgContLang->convertToSortkey( $this->until[$type] ) );
- $this->flip[$type] = true;
- }
-
- $res = $dbr->select(
- $tables,
- array_merge( $fields, array( 'cl_sortkey_prefix' ) ),
- $conds + $extraConds,
- __METHOD__,
- $opts + array( 'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey' ),
- $joins
- );
-
- $count = 0;
- foreach ( $res as $row ) {
- $title = Title::newFromRow( $row );
- $rawSortkey = $title->getCategorySortkey( $row->cl_sortkey_prefix );
-
- if ( ++$count > $this->limit ) {
- # We've reached the one extra which shows that there
- # are additional pages to be had. Stop here...
- $this->nextPage[$type] = $rawSortkey;
- break;
- }
-
- if ( $title->getNamespace() == NS_CATEGORY ) {
- $cat = Category::newFromRow( $row, $title );
- $this->addSubcategoryObject( $cat, $rawSortkey, $row->page_len );
- } elseif ( $this->showGallery && $title->getNamespace() == NS_FILE ) {
- $this->addImage( $title, $rawSortkey, $row->page_len, $row->page_is_redirect );
- } else {
- $this->addPage( $title, $rawSortkey, $row->page_len, $row->page_is_redirect );
- }
- }
- }
+ function view() {
+ $request = $this->getContext()->getRequest();
+ $diff = $request->getVal( 'diff' );
+ $diffOnly = $request->getBool( 'diffonly',
+ $this->getContext()->getUser()->getOption( 'diffonly' ) );
+ if ( isset( $diff ) && $diffOnly ) {
+ parent::view();
return;
}
- # Non-$wgExperimentalCategorySort stuff
-
- if ( $this->from != '' ) {
- $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $this->from );
- $this->flip = false;
- } elseif ( $this->until != '' ) {
- $pageCondition = 'cl_sortkey < ' . $dbr->addQuotes( $this->until );
- $this->flip = true;
- } else {
- $pageCondition = '1 = 1';
- $this->flip = false;
- }
-
- $res = $dbr->select(
- $tables,
- $fields,
- $conds + array( $pageCondition ),
- __METHOD__,
- $opts + array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey' ),
- $joins
- );
-
- $count = 0;
- $this->nextPage = null;
-
- foreach ( $res as $row ) {
- if ( ++$count > $this->limit ) {
- // We've reached the one extra which shows that there are
- // additional pages to be had. Stop here...
- $this->nextPage = $row->cl_sortkey;
- break;
- }
-
- $title = Title::newFromRow( $row );
-
- if ( $title->getNamespace() == NS_CATEGORY ) {
- $cat = Category::newFromRow( $row, $title );
- $this->addSubcategoryObject( $cat, $row->cl_sortkey, $row->page_len );
- } elseif ( $this->showGallery && $title->getNamespace() == NS_FILE ) {
- $this->addImage( $title, $row->cl_sortkey, $row->page_len, $row->page_is_redirect );
- } else {
- $this->addPage( $title, $row->cl_sortkey, $row->page_len, $row->page_is_redirect );
- }
- }
- }
-
- function getCategoryTop() {
- $r = $this->getCategoryBottom();
- return $r === ''
- ? $r
- : "
\n" . $r;
- }
-
- function getSubcategorySection() {
- # Don't show subcategories section if there are none.
- $r = '';
- $rescnt = count( $this->children );
- $dbcnt = $this->cat->getSubcatCount();
- $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'subcat' );
-
- if ( $rescnt > 0 ) {
- # Showing subcategories
- $r .= "
';
- $prevchar = null;
+ $reqArray = $request->getValues();
- foreach ( $columns as $column ) {
- $colContents = array();
+ $from = $until = array();
+ foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
+ $from[$type] = $request->getVal( "{$type}from", $oldFrom );
+ $until[$type] = $request->getVal( "{$type}until", $oldUntil );
- # Kind of like array_flip() here, but we keep duplicates in an
- # array instead of dropping them.
- foreach ( $column as $article => $char ) {
- if ( !isset( $colContents[$char] ) ) {
- $colContents[$char] = array();
- }
- $colContents[$char][] = $article;
+ // Do not want old-style from/until propagating in nav links.
+ if ( !isset( $reqArray["{$type}from"] ) && isset( $reqArray["from"] ) ) {
+ $reqArray["{$type}from"] = $reqArray["from"];
}
-
- $first = true;
- foreach ( $colContents as $char => $articles ) {
- $ret .= '' . htmlspecialchars( $char ); - if ( $first && $char === $prevchar ) { - # We're continuing a previous chunk at the top of a new - # column, so add " cont." after the letter. - $ret .= ' ' . wfMsgHtml( 'listingcontinuesabbrev' ); - } - $ret .= "\n"; - - $ret .= '
| \n"; } - $ret .= ' |