X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=6fbcd3c17cb993302ee37edd5f4105a657f141f2;hb=a4c45fb2546ba5ea1a653f28d0c5bdfc9a790e80;hp=b51598632be0b7cd79630ecc1ea79d644a62d817;hpb=4a24d6dfe8f90d4855aa0ce6c4628b02a3d2d305;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index b51598632b..6fbcd3c17c 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -3,23 +3,23 @@ * Special handling for category description pages * Modelled after ImagePage.php * - * @package MediaWiki */ if( !defined( 'MEDIAWIKI' ) ) - die( -1 ); - -global $wgCategoryMagicGallery; -if( $wgCategoryMagicGallery ) - /** */ - require_once('ImageGallery.php'); + die( 1 ); /** - * @package MediaWiki */ class CategoryPage extends Article { - function view() { + global $wgRequest, $wgUser; + + $diff = $wgRequest->getVal( 'diff' ); + $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) ); + + if ( isset( $diff ) && $diffOnly ) + return Article::view(); + if(!wfRunHooks('CategoryPageView', array(&$this))) return; if ( NS_CATEGORY == $this->mTitle->getNamespace() ) { @@ -37,170 +37,278 @@ class CategoryPage extends Article { } } + /** + * This page should not be cached if 'from' or 'until' has been used + * @return bool + */ + function isFileCacheable() { + global $wgRequest; + + return ( ! Article::isFileCacheable() + || $wgRequest->getVal( 'from' ) + || $wgRequest->getVal( 'until' ) + ) ? false : true; + } + function openShowCategory() { # For overloading } - # generate a list of subcategories and pages for a category - # depending on wfMsg("usenewcategorypage") it either calls the new - # or the old code. The new code will not work properly for some - # languages due to sorting issues, so they might want to turn it - # off. - function closeShowCategory() { global $wgOut, $wgRequest; - $pageConditions = array(); $from = $wgRequest->getVal( 'from' ); $until = $wgRequest->getVal( 'until' ); - $wgOut->addHTML( $this->doCategoryMagic( $from, $until ) ); + + $viewer = new CategoryViewer( $this->mTitle, $from, $until ); + $wgOut->addHTML( $viewer->getHTML() ); } +} +class CategoryViewer { + var $title, $limit, $from, $until, + $articles, $articles_start_char, + $children, $children_start_char, + $showGallery, $gallery, + $skin; + + function __construct( $title, $from = '', $until = '' ) { + global $wgCategoryPagingLimit; + $this->title = $title; + $this->from = $from; + $this->until = $until; + $this->limit = $wgCategoryPagingLimit; + } + /** * Format the category data list. * * @param string $from -- return only sort keys from this item on * @param string $until -- don't return keys after this point. * @return string HTML output - * @access private + * @private */ - function doCategoryMagic( $from = '', $until = '' ) { - global $wgContLang,$wgUser, $wgCategoryMagicGallery, $wgCategoryPagingLimit; - $fname = 'CategoryPage::doCategoryMagic'; - wfProfileIn( $fname ); - - $articles = array(); - $articles_start_char = array(); - $children = array(); - $children_start_char = array(); - $data = array(); - if( $wgCategoryMagicGallery ) { - $ig = new ImageGallery(); + function getHTML() { + global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit; + wfProfileIn( __METHOD__ ); + + $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery; + + $this->clearCategoryState(); + $this->doCategoryQuery(); + $this->finaliseCategoryState(); + + $r = $this->getCategoryTop() . + $this->getSubcategorySection() . + $this->getPagesSection() . + $this->getImageSection() . + $this->getCategoryBottom(); + + // Give a proper message if category is empty + if ( $r == '' ) { + $r = wfMsgExt( 'category-empty', array( 'parse' ) ); } - $dbr =& wfGetDB( DB_SLAVE ); - if( $from != '' ) { - $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $from ); - $flip = false; - } elseif( $until != '' ) { - $pageCondition = 'cl_sortkey < ' . $dbr->addQuotes( $until ); - $flip = true; + wfProfileOut( __METHOD__ ); + return $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; + } + + /** + * Add a subcategory to the internal lists + */ + function addSubcategory( $title, $sortkey, $pageLength ) { + global $wgContLang; + // Subcategory; strip the 'Category' namespace from the link text. + $this->children[] = $this->getSkin()->makeKnownLinkObj( + $title, $wgContLang->convertHtml( $title->getText() ) ); + + $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; + + if( $title->getPrefixedText() == $sortkey ) { + $firstChar = $wgContLang->firstChar( $title->getDBkey() ); + } else { + $firstChar = $wgContLang->firstChar( $sortkey ); + } + + return $wgContLang->convert( $firstChar ); + } + + /** + * Add a page in the image namespace + */ + function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) { + if ( $this->showGallery ) { + $image = new Image( $title ); + if( $this->flip ) { + $this->gallery->insert( $image ); + } else { + $this->gallery->add( $image ); + } + } else { + $this->addPage( $title, $sortkey, $pageLength, $isRedirect ); + } + } + + /** + * Add a miscellaneous page + */ + function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) { + global $wgContLang; + $this->articles[] = $isRedirect + ? '' . $this->getSkin()->makeKnownLinkObj( $title ) . '' + : $this->getSkin()->makeSizeLinkObj( $pageLength, $title ); + $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) ); + } + + function finaliseCategoryState() { + if( $this->flip ) { + $this->children = array_reverse( $this->children ); + $this->children_start_char = array_reverse( $this->children_start_char ); + $this->articles = array_reverse( $this->articles ); + $this->articles_start_char = array_reverse( $this->articles_start_char ); + } + } + + function doCategoryQuery() { + $dbr = wfGetDB( DB_SLAVE ); + 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'; - $flip = false; + $this->flip = false; } - $limit = $wgCategoryPagingLimit; $res = $dbr->select( array( 'page', 'categorylinks' ), - array( 'page_title', 'page_namespace', 'page_len', 'cl_sortkey' ), + array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey' ), array( $pageCondition, 'cl_from = page_id', - 'cl_to' => $this->mTitle->getDBKey()), + 'cl_to' => $this->title->getDBkey()), #'page_is_redirect' => 0), #+ $pageCondition, - $fname, - array( 'ORDER BY' => $flip ? 'cl_sortkey DESC' : 'cl_sortkey', - 'LIMIT' => $limit + 1 ) ); + __METHOD__, + array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey', + 'USE INDEX' => 'cl_sortkey', + 'LIMIT' => $this->limit + 1 ) ); - $sk =& $wgUser->getSkin(); - $r = "
\n"; $count = 0; - $nextPage = null; + $this->nextPage = null; while( $x = $dbr->fetchObject ( $res ) ) { - if( ++$count > $limit ) { + if( ++$count > $this->limit ) { // We've reached the one extra which shows that there are // additional pages to be had. Stop here... - $nextPage = $x->cl_sortkey; + $this->nextPage = $x->cl_sortkey; break; } $title = Title::makeTitle( $x->page_namespace, $x->page_title ); if( $title->getNamespace() == NS_CATEGORY ) { - // Subcategory; strip the 'Category' namespace from the link text. - array_push( $children, $sk->makeKnownLinkObj( $title, $wgContLang->convertHtml( $title->getText() ) ) ); - - // 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... - $sortkey=''; - if( $title->getPrefixedText() == $x->cl_sortkey ) { - $sortkey=$wgContLang->firstChar( $x->page_title ); - } else { - $sortkey=$wgContLang->firstChar( $x->cl_sortkey ); - } - array_push( $children_start_char, $wgContLang->convert( $sortkey ) ) ; - } elseif( $wgCategoryMagicGallery && $title->getNamespace() == NS_IMAGE ) { - // Show thumbnails of categorized images, in a separate chunk - if( $flip ) { - $ig->insert( Image::newFromTitle( $title ) ); - } else { - $ig->add( Image::newFromTitle( $title ) ); - } + $this->addSubcategory( $title, $x->cl_sortkey, $x->page_len ); + } elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) { + $this->addImage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect ); } else { - // Page in this category - array_push( $articles, $sk->makeSizeLinkObj( $x->page_len, $title, $wgContLang->convert( $title->getPrefixedText() ) ) ) ; - array_push( $articles_start_char, $wgContLang->convert( $wgContLang->firstChar( $x->cl_sortkey ) ) ); + $this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect ); } } $dbr->freeResult( $res ); + } - if( $flip ) { - $children = array_reverse( $children ); - $children_start_char = array_reverse( $children_start_char ); - $articles = array_reverse( $articles ); - $articles_start_char = array_reverse( $articles_start_char ); - } - - if( $until != '' ) { - $r .= $this->pagingLinks( $this->mTitle, $nextPage, $until, $limit ); - } elseif( $nextPage != '' || $from != '' ) { - $r .= $this->pagingLinks( $this->mTitle, $from, $nextPage, $limit ); + function getCategoryTop() { + $r = ''; + if( $this->until != '' ) { + $r .= $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit ); + } elseif( $this->nextPage != '' || $this->from != '' ) { + $r .= $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit ); } + return $r == '' + ? $r + : "
\n" . $r; + } + function getSubcategorySection() { # Don't show subcategories section if there are none. - if( count( $children ) > 0 ) { + $r = ''; + $c = count( $this->children ); + if( $c > 0 ) { # Showing subcategories + $r .= "
\n"; $r .= '

' . wfMsg( 'subcategories' ) . "

\n"; - $r .= $this->formatCount( $children, 'subcategorycount' ); - $r .= $this->formatList( $children, $children_start_char ); + $r .= wfMsgExt( 'subcategorycount', array( 'parse' ), $c ); + $r .= $this->formatList( $this->children, $this->children_start_char ); + $r .= "\n
"; } + return $r; + } - # Showing articles in this category - $ti = htmlspecialchars( $this->mTitle->getText() ); - $r .= '

' . wfMsg( 'category_header', $ti ) . "

\n"; - $r .= $this->formatCount( $articles, 'categoryarticlecount' ); - $r .= $this->formatList( $articles, $articles_start_char ); - - if( $wgCategoryMagicGallery && ! $ig->isEmpty() ) { - $r.= $ig->toHTML(); + function getPagesSection() { + $ti = htmlspecialchars( $this->title->getText() ); + # Don't show articles section if there are none. + $r = ''; + $c = count( $this->articles ); + if( $c > 0 ) { + $r = "
\n"; + $r .= '

' . wfMsg( 'category_header', $ti ) . "

\n"; + $r .= wfMsgExt( 'categoryarticlecount', array( 'parse' ), $c ); + $r .= $this->formatList( $this->articles, $this->articles_start_char ); + $r .= "\n
"; } + return $r; + } - if( $until != '' ) { - $r .= $this->pagingLinks( $this->mTitle, $nextPage, $until, $limit ); - } elseif( $nextPage != '' || $from != '' ) { - $r .= $this->pagingLinks( $this->mTitle, $from, $nextPage, $limit ); + function getImageSection() { + if( $this->showGallery && ! $this->gallery->isEmpty() ) { + return "
\n" . + '

' . wfMsg( 'category-media-header', htmlspecialchars($this->title->getText()) ) . "

\n" . + wfMsgExt( 'category-media-count', array( 'parse' ), $this->gallery->count() ) . + $this->gallery->toHTML() . "\n
"; + } else { + return ''; } - - wfProfileOut( $fname ); - return $r; } - /** - * @param array $articles - * @param string $message - * @return string - * @access private - */ - function formatCount( $articles, $message ) { - global $wgContLang; - $numart = count( $articles ); - if( $numart == 1 ) { - # Slightly different message to avoid silly plural - $message .= '1'; + function getCategoryBottom() { + if( $this->until != '' ) { + return $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit ); + } elseif( $this->nextPage != '' || $this->from != '' ) { + return $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit ); + } else { + return ''; } - return wfMsg( $message, $wgContLang->formatNum( $numart ) ); } + /** * Format a list of articles chunked by letter, either as a * bullet list or a columnar format, depending on the length. @@ -209,7 +317,7 @@ class CategoryPage extends Article { * @param array $articles_start_char * @param int $cutoff * @return string - * @access private + * @private */ function formatList( $articles, $articles_start_char, $cutoff = 6 ) { if ( count ( $articles ) > $cutoff ) { @@ -228,7 +336,7 @@ class CategoryPage extends Article { * @param array $articles * @param array $articles_start_char * @return string - * @access private + * @private */ function columnList( $articles, $articles_start_char ) { // divide list into three equal chunks @@ -264,7 +372,7 @@ class CategoryPage extends Article { } $cont_msg = ""; if ( $articles_start_char[$index] == $prev_start_char ) - $cont_msg = wfMsgHtml('listingcontinuesabbrev'); + $cont_msg = ' ' . wfMsgHtml( 'listingcontinuesabbrev' ); $r .= "

" . htmlspecialchars( $articles_start_char[$index] ) . "$cont_msg

\n