X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=56f85faabeaa2c2a27d66329c823c6d251c8c3da;hb=48c3231e32f8486b54c92770d821736019476a36;hp=e5c11e822cb8c8b8b7397c1b8d8caf51b5da6300;hpb=b817c0c15fc8e7cf483c21089834f65d716d9786;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index e5c11e822c..56f85faabe 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -3,24 +3,25 @@ * Special handling for category description pages * Modelled after ImagePage.php * - * @package MediaWiki */ -if( !defined( 'MEDIAWIKI' ) ) - die(); - -global $wgCategoryMagicGallery; -if( $wgCategoryMagicGallery ) - /** */ - require_once('ImageGallery.php'); +if ( !defined( 'MEDIAWIKI' ) ) + die( 1 ); /** - * @package MediaWiki */ class CategoryPage extends Article { - function view() { - if(!wfRunHooks('CategoryPageView', array(&$this))) return; + 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() ) { $this->openShowCategory(); @@ -28,187 +29,339 @@ class CategoryPage extends Article { Article::view(); - # If the article we've just shown is in the "Image" namespace, - # follow it with the history list and link list for the image - # it describes. - 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 } - # 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; + /** Category object for this page */ + private $cat; + + function __construct( $title, $from = '', $until = '' ) { + global $wgCategoryPagingLimit; + $this->title = $title; + $this->from = $from; + $this->until = $until; + $this->limit = $wgCategoryPagingLimit; + $this->cat = Category::newFromTitle( $title ); } /** * 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 getHTML() { + global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit, $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; + } + + /** + * Add a subcategory to the internal lists, using a Category object + */ + function addSubcategoryObject( $cat, $sortkey, $pageLength ) { + $title = $cat->getTitle(); + $this->addSubcategory( $title, $sortkey, $pageLength ); + } + + /** + * Add a subcategory to the internal lists, using a title object + * @deprecated kept for compatibility, please use addSubcategoryObject instead + */ + 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; + + 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 ) { + if ( $this->flip ) { + $this->gallery->insert( $title ); + } else { + $this->gallery->add( $title ); + } + } else { + $this->addPage( $title, $sortkey, $pageLength, $isRedirect ); + } + } + + /** + * Add a miscellaneous page */ - function doCategoryMagic( $from = '', $until = '' ) { - global $wgContLang,$wgUser, $wgCategoryMagicGallery; - $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 addPage( $title, $sortkey, $pageLength, $isRedirect = false ) { + global $wgContLang; + $this->articles[] = $isRedirect + ? '' . + $this->getSkin()->link( + $title, + null, + array(), + array(), + array( 'known', 'noclasses' ) + ) . '' + : $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 ); } + } - $dbr =& wfGetDB( DB_SLAVE ); - if( $from != '' ) { - $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $from ); - $flip = false; - } elseif( $until != '' ) { - $pageCondition = 'cl_sortkey < ' . $dbr->addQuotes( $until ); - $flip = true; + function doCategoryQuery() { + $dbr = wfGetDB( DB_SLAVE, 'category' ); + 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 = 200; + $res = $dbr->select( - array( 'page', 'categorylinks' ), - array( 'page_title', 'page_namespace', 'page_len', 'cl_sortkey' ), - array( $pageCondition, - 'cl_from = page_id', - 'cl_to' => $this->mTitle->getDBKey()), - #'page_is_redirect' => 0), - #+ $pageCondition, - $fname, - array( 'ORDER BY' => $flip ? 'cl_sortkey DESC' : 'cl_sortkey', - 'LIMIT' => $limit + 1 ) ); - - $sk =& $wgUser->getSkin(); - $r = "
\n"; + array( 'page', 'categorylinks', 'category' ), + array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey', + 'cat_id', 'cat_title', 'cat_subcats', 'cat_pages', 'cat_files' ), + array( $pageCondition, 'cl_to' => $this->title->getDBkey() ), + __METHOD__, + array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey', + 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ), + 'LIMIT' => $this->limit + 1 ), + array( 'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ), + 'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ) + ); + $count = 0; - $nextPage = null; - while( $x = $dbr->fetchObject ( $res ) ) { - if( ++$count > $limit ) { + $this->nextPage = null; + + while ( $x = $dbr->fetchObject ( $res ) ) { + 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 ) ); - } + if ( $title->getNamespace() == NS_CATEGORY ) { + $cat = Category::newFromRow( $x, $title ); + $this->addSubcategoryObject( $cat, $x->cl_sortkey, $x->page_len ); + } elseif ( $this->showGallery && $title->getNamespace() == NS_FILE ) { + $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 = $this->getCategoryBottom(); + return $r === '' + ? $r + : "
\n" . $r; + } + function getSubcategorySection() { # Don't show subcategories section if there are none. - if( count( $children ) > 0 ) { + $r = ''; + $rescnt = count( $this->children ); + $dbcnt = $this->cat->getSubcatCount(); + $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'subcat' ); + + if ( $rescnt > 0 ) { # Showing subcategories + $r .= "
\n"; $r .= '

' . wfMsg( 'subcategories' ) . "

\n"; - $r .= $this->formatCount( $children, 'subcategorycount' ); - $r .= $this->formatList( $children, $children_start_char ); + $r .= $countmsg; + $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 = ''; + + # FIXME, here and in the other two sections: we don't need to bother + # with this rigamarole if the entire category contents fit on one page + # and have already been retrieved. We can just use $rescnt in that + # case and save a query and some logic. + $dbcnt = $this->cat->getPageCount() - $this->cat->getSubcatCount() + - $this->cat->getFileCount(); + $rescnt = count( $this->articles ); + $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' ); + + if ( $rescnt > 0 ) { + $r = "
\n"; + $r .= '

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

\n"; + $r .= $countmsg; + $r .= $this->formatList( $this->articles, $this->articles_start_char ); + $r .= "\n
"; } - - 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 getImageSection() { + if ( $this->showGallery && ! $this->gallery->isEmpty() ) { + $dbcnt = $this->cat->getFileCount(); + $rescnt = $this->gallery->count(); + $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' ); + + return "
\n" . + '

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

\n" . + $countmsg . $this->gallery->toHTML() . "\n
"; + } else { + return ''; + } + } + + 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. * - * @param array $articles - * @param array $articles_start_char - * @param int $cutoff - * @return string - * @access private + * @param $articles Array + * @param $articles_start_char Array + * @param $cutoff Int + * @return String + * @private */ function formatList( $articles, $articles_start_char, $cutoff = 6 ) { if ( count ( $articles ) > $cutoff ) { return $this->columnList( $articles, $articles_start_char ); - } elseif ( count($articles) > 0) { + } elseif ( count( $articles ) > 0 ) { // for short lists of articles in categories. return $this->shortList( $articles, $articles_start_char ); } @@ -219,78 +372,77 @@ class CategoryPage extends Article { * Format a list of articles chunked by letter in a three-column * list, ordered vertically. * - * @param array $articles - * @param array $articles_start_char - * @return string - * @access private + * TODO: Take the headers into account when creating columns, so they're + * more visually equal. + * + * More distant TODO: Scrap this and use CSS columns, whenever IE finally + * supports those. + * + * @param $articles Array + * @param $articles_start_char Array + * @return String + * @private */ function columnList( $articles, $articles_start_char ) { - // divide list into three equal chunks - $chunk = (int) (count ( $articles ) / 3); + $columns = array_combine( $articles, $articles_start_char ); + # Split into three columns + $columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ ); - // get and display header - $r = ''; + $ret = '
\n"; + $ret .= ''; + $first = false; + $prevchar = $char; + } + $ret .= "\n
'; + $prevchar = null; - $prev_start_char = 'none'; + foreach ( $columns as $column ) { + $colContents = array(); - // loop through the chunks - for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0; - $chunkIndex < 3; - $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1) - { - $r .= "\n"; - $atColumnTop = true; + # 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; + } - // output all articles in category - for ($index = $startChunk ; - $index < $endChunk && $index < count($articles); - $index++ ) - { - // check for change of starting letter or begining of chunk - if ( ($index == $startChunk) || - ($articles_start_char[$index] != $articles_start_char[$index - 1]) ) - - { - if( $atColumnTop ) { - $atColumnTop = false; - } else { - $r .= "\n"; - } - $cont_msg = ""; - if ( $articles_start_char[$index] == $prev_start_char ) - $cont_msg = wfMsg('listingcontinuesabbrev'); - $r .= "

{$articles_start_char[$index]}$cont_msg

\n
    "; - $prev_start_char = $articles_start_char[$index]; + $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"; - $r .= "
  • {$articles[$index]}
    • "; - } - if( !$atColumnTop ) { - $r .= "
\n"; - } - $r .= "		"; } - $r .= '
'; - return $r; + + $ret .= ''; + return $ret; } /** * Format a list of articles chunked by letter in a bullet list. - * @param array $articles - * @param array $articles_start_char - * @return string - * @access private + * @param $articles Array + * @param $articles_start_char Array + * @return String + * @private */ function shortList( $articles, $articles_start_char ) { - $r = '

'.$articles_start_char[0]."

\n"; - $r .= '