X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=4baa41388b619a3a69a4636c2e0f5f3c13e6ee07;hb=4a8df703620f599d543ea116a6df67ab76be42ed;hp=2c9a1636a96b1515bb84b97e70213e40a1f083e9;hpb=ed4303922f4e850418168595c2a22cdd895081cc;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index 2c9a1636a9..4baa41388b 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,14 +29,23 @@ 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 @@ -53,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; @@ -64,13 +76,12 @@ 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 */ @@ -90,6 +101,11 @@ class CategoryViewer { $this->getImageSection() . $this->getCategoryBottom(); + // Give a proper message if category is empty + if ( $r == '' ) { + $r = wfMsgExt( 'category-empty', array( 'parse' ) ); + } + wfProfileOut( __METHOD__ ); return $r; } @@ -101,7 +117,7 @@ class CategoryViewer { $this->children_start_char = array(); if( $this->showGallery ) { $this->gallery = new ImageGallery(); - $this->gallery->setParsing(); + $this->gallery->setHideBadImages(); } } @@ -114,12 +130,21 @@ 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( + $this->children[] = $this->getSkin()->makeKnownLinkObj( $title, $wgContLang->convertHtml( $title->getText() ) ); $this->children_start_char[] = $this->getSubcategorySortChar( $title, $sortkey ); @@ -134,13 +159,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 ); } @@ -149,11 +174,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 ); @@ -165,12 +189,10 @@ class CategoryViewer { */ function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) { global $wgContLang; - $link = $this->getSkin()->makeSizeLinkObj( - $pageLength, $title, $wgContLang->convert( $title->getPrefixedText() ) - ); - if ($isRedirect) - $link = ''.$link.''; - $this->articles[] = $link; + $titletext = $wgContLang->convert( $title->getPrefixedText() ); + $this->articles[] = $isRedirect + ? '' . $this->getSkin()->makeKnownLinkObj( $title, $titletext ) . '' + : $this->getSkin()->makeSizeLinkObj( $pageLength, $title, $titletext ); $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) ); } @@ -196,17 +218,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; @@ -221,8 +243,9 @@ 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 ); @@ -232,24 +255,28 @@ class CategoryViewer { } function getCategoryTop() { - $r = "
\n"; + $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; + return $r == '' + ? $r + : "
\n" . $r; } 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
"; } @@ -260,11 +287,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
"; } @@ -273,10 +309,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 ''; } @@ -296,10 +335,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 ) { @@ -316,9 +355,9 @@ 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 + * @param $articles Array + * @param $articles_start_char Array + * @return String * @private */ function columnList( $articles, $articles_start_char ) { @@ -355,7 +394,7 @@ class CategoryViewer { } $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