X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=362fbde97d0c845c372c83180d8a1ebfd800d92c;hb=d26d659ef1b1897ad501ed173bca431ecbeab88a;hp=656d3162fe338523bea25a7500a3c74418b1487a;hpb=115f405cdb5286399e2eb3f0da55427e23db7fe7;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index 656d3162fe..362fbde97d 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -20,7 +20,8 @@ class CategoryPage extends Article { if ( isset( $diff ) && $diffOnly ) return Article::view(); - if(!wfRunHooks('CategoryPageView', array(&$this))) return; + if( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) + return; if ( NS_CATEGORY == $this->mTitle->getNamespace() ) { $this->openShowCategory(); @@ -28,26 +29,22 @@ 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(); } } - + /** - * This page should not be cached if 'from' or 'until' has been used - * @return bool + * Don't return a 404 for categories in use. */ - function isFileCacheable() { - global $wgRequest; - - return ( ! Article::isFileCacheable() - || $wgRequest->getVal( 'from' ) - || $wgRequest->getVal( 'until' ) - ) ? false : true; + function hasViewableContent() { + if( parent::hasViewableContent() ) { + return true; + } else { + $cat = Category::newFromTitle( $this->mTitle ); + return $cat->getId() != 0; + } + } function openShowCategory() { @@ -66,10 +63,12 @@ class CategoryPage extends Article { class CategoryViewer { var $title, $limit, $from, $until, - $articles, $articles_start_char, + $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; @@ -77,18 +76,17 @@ class CategoryViewer { $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 * @private */ function getHTML() { - global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit; + global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit, $wgContLang; wfProfileIn( __METHOD__ ); $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery; @@ -97,11 +95,22 @@ class CategoryViewer { $this->doCategoryQuery(); $this->finaliseCategoryState(); - $r = $this->getCategoryTop() . - $this->getSubcategorySection() . + $r = $this->getSubcategorySection() . $this->getPagesSection() . - $this->getImageSection() . - $this->getCategoryBottom(); + $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 == '' ) { @@ -109,7 +118,7 @@ class CategoryViewer { } wfProfileOut( __METHOD__ ); - return $r; + return $wgContLang->convert($r); } function clearCategoryState() { @@ -132,13 +141,26 @@ class CategoryViewer { } /** - * Add a subcategory to the internal lists + * 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 ) { - global $wgContLang; // Subcategory; strip the 'Category' namespace from the link text. - $this->children[] = $this->getSkin()->makeKnownLinkObj( - $title, $wgContLang->convertHtml( $title->getText() ) ); + $this->children[] = $this->getSkin()->link( + $title, + null, + array(), + array(), + array( 'known', 'noclasses' ) + ); $this->children_start_char[] = $this->getSubcategorySortChar( $title, $sortkey ); } @@ -152,13 +174,13 @@ class CategoryViewer { */ function getSubcategorySortChar( $title, $sortkey ) { global $wgContLang; - + if( $title->getPrefixedText() == $sortkey ) { $firstChar = $wgContLang->firstChar( $title->getDBkey() ); } else { $firstChar = $wgContLang->firstChar( $sortkey ); } - + return $wgContLang->convert( $firstChar ); } @@ -167,11 +189,10 @@ class CategoryViewer { */ function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) { if ( $this->showGallery ) { - $image = new Image( $title ); if( $this->flip ) { - $this->gallery->insert( $image ); + $this->gallery->insert( $title ); } else { - $this->gallery->add( $image ); + $this->gallery->add( $title ); } } else { $this->addPage( $title, $sortkey, $pageLength, $isRedirect ); @@ -184,7 +205,14 @@ class CategoryViewer { function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) { global $wgContLang; $this->articles[] = $isRedirect - ? '' . $this->getSkin()->makeKnownLinkObj( $title ) . '' + ? '' . + $this->getSkin()->link( + $title, + null, + array(), + array(), + array( 'known', 'noclasses' ) + ) . '' : $this->getSkin()->makeSizeLinkObj( $pageLength, $title ); $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) ); } @@ -199,7 +227,7 @@ class CategoryViewer { } function doCategoryQuery() { - $dbr = wfGetDB( DB_SLAVE ); + $dbr = wfGetDB( DB_SLAVE, 'category' ); if( $this->from != '' ) { $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $this->from ); $this->flip = false; @@ -211,17 +239,17 @@ class CategoryViewer { $this->flip = false; } $res = $dbr->select( - array( 'page', 'categorylinks' ), - array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey' ), - array( $pageCondition, - 'cl_from = page_id', - 'cl_to' => $this->title->getDBKey()), - #'page_is_redirect' => 0), - #+ $pageCondition, + 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' => 'cl_sortkey', - 'LIMIT' => $this->limit + 1 ) ); + '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; $this->nextPage = null; @@ -236,24 +264,19 @@ class CategoryViewer { $title = Title::makeTitle( $x->page_namespace, $x->page_title ); if( $title->getNamespace() == NS_CATEGORY ) { - $this->addSubcategory( $title, $x->cl_sortkey, $x->page_len ); - } elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) { + $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 { $this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect ); } } - $dbr->freeResult( $res ); } 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 = $this->getCategoryBottom(); + return $r === '' ? $r : "
\n" . $r; } @@ -261,12 +284,14 @@ class CategoryViewer { function getSubcategorySection() { # Don't show subcategories section if there are none. $r = ''; - $c = count( $this->children ); - if( $c > 0 ) { + $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 .= wfMsgExt( 'subcategorycount', array( 'parse' ), $c ); + $r .= $countmsg; $r .= $this->formatList( $this->children, $this->children_start_char ); $r .= "\n
"; } @@ -277,11 +302,20 @@ class CategoryViewer { $ti = htmlspecialchars( $this->title->getText() ); # Don't show articles section if there are none. $r = ''; - $c = count( $this->articles ); - if( $c > 0 ) { + + # 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 .= wfMsgExt( 'categoryarticlecount', array( 'parse' ), $c ); + $r .= $countmsg; $r .= $this->formatList( $this->articles, $this->articles_start_char ); $r .= "\n
"; } @@ -290,10 +324,13 @@ class CategoryViewer { 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" . - wfMsgExt( 'category-media-count', array( 'parse' ), $this->gallery->count() ) . - $this->gallery->toHTML() . "\n
"; + '

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

\n" . + $countmsg . $this->gallery->toHTML() . "\n"; } else { return ''; } @@ -313,10 +350,10 @@ class CategoryViewer { * 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 + * @param $articles Array + * @param $articles_start_char Array + * @param $cutoff Int + * @return String * @private */ function formatList( $articles, $articles_start_char, $cutoff = 6 ) { @@ -333,68 +370,67 @@ class CategoryViewer { * 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 + * 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 = ' ' . wfMsgHtml( 'listingcontinuesabbrev' ); - $r .= "

" . htmlspecialchars( $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 + * @param $articles Array + * @param $articles_start_char Array + * @return String * @private */ function shortList( $articles, $articles_start_char ) { @@ -414,12 +450,12 @@ class CategoryViewer { } /** - * @param Title $title - * @param string $first - * @param string $last - * @param int $limit - * @param array $query - additional query options to pass - * @return string + * @param $title Title object + * @param $first String + * @param $last String + * @param $limit Int + * @param $query Array: additional query options to pass + * @return String * @private */ function pagingLinks( $title, $first, $last, $limit, $query = array() ) { @@ -427,20 +463,77 @@ class CategoryViewer { $sk = $this->getSkin(); $limitText = $wgLang->formatNum( $limit ); - $prevLink = htmlspecialchars( wfMsg( 'prevn', $limitText ) ); + $prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText ); if( $first != '' ) { - $prevLink = $sk->makeLinkObj( $title, $prevLink, - wfArrayToCGI( $query + array( 'until' => $first ) ) ); + $prevQuery = $query; + $prevQuery['until'] = $first; + $prevLink = $sk->linkKnown( + $title, + $prevLink, + array(), + $prevQuery + ); } - $nextLink = htmlspecialchars( wfMsg( 'nextn', $limitText ) ); + $nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText ); if( $last != '' ) { - $nextLink = $sk->makeLinkObj( $title, $nextLink, - wfArrayToCGI( $query + array( 'from' => $last ) ) ); + $lastQuery = $query; + $lastQuery['from'] = $last; + $nextLink = $sk->linkKnown( + $title, + $nextLink, + array(), + $lastQuery + ); } return "($prevLink) ($nextLink)"; } -} - - + /** + * What to do if the category table conflicts with the number of results + * returned? This function says what. It works the same whether the + * things being counted are articles, subcategories, or files. + * + * Note for grepping: uses the messages category-article-count, + * category-article-count-limited, category-subcat-count, + * category-subcat-count-limited, category-file-count, + * category-file-count-limited. + * + * @param $rescnt Int: The number of items returned by our database query. + * @param $dbcnt Int: The number of items according to the category table. + * @param $type String: 'subcat', 'article', or 'file' + * @return String: A message giving the number of items, to output to HTML. + */ + private function getCountMessage( $rescnt, $dbcnt, $type ) { + global $wgLang; + # There are three cases: + # 1) The category table figure seems sane. It might be wrong, but + # we can't do anything about it if we don't recalculate it on ev- + # ery category view. + # 2) The category table figure isn't sane, like it's smaller than the + # number of actual results, *but* the number of results is less + # than $this->limit and there's no offset. In this case we still + # know the right figure. + # 3) We have no idea. + $totalrescnt = count( $this->articles ) + count( $this->children ) + + ($this->showGallery ? $this->gallery->count() : 0); + if($dbcnt == $rescnt || (($totalrescnt == $this->limit || $this->from + || $this->until) && $dbcnt > $rescnt)){ + # Case 1: seems sane. + $totalcnt = $dbcnt; + } elseif($totalrescnt < $this->limit && !$this->from && !$this->until){ + # Case 2: not sane, but salvageable. Use the number of results. + # Since there are fewer than 200, we can also take this opportunity + # to refresh the incorrect category table entry -- which should be + # quick due to the small number of entries. + $totalcnt = $rescnt; + $this->cat->refreshCounts(); + } else { + # Case 3: hopeless. Don't give a total count at all. + return wfMsgExt("category-$type-count-limited", 'parse', + $wgLang->formatNum( $rescnt ) ); + } + return wfMsgExt( "category-$type-count", 'parse', $wgLang->formatNum( $rescnt ), + $wgLang->formatNum( $totalcnt ) ); + } +}