From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 28 Jul 2010 11:52:48 +0200 Subject: update to MediaWiki 1.16.0 --- includes/CategoryPage.php | 233 +++++++++++++++++++++++++++------------------- 1 file changed, 135 insertions(+), 98 deletions(-) (limited to 'includes/CategoryPage.php') diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index 03ecb5dc..56f85faa 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -5,7 +5,7 @@ * */ -if( !defined( 'MEDIAWIKI' ) ) +if ( !defined( 'MEDIAWIKI' ) ) die( 1 ); /** @@ -20,7 +20,7 @@ class CategoryPage extends Article { if ( isset( $diff ) && $diffOnly ) return Article::view(); - if( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) + if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) return; if ( NS_CATEGORY == $this->mTitle->getNamespace() ) { @@ -33,18 +33,17 @@ class CategoryPage extends Article { $this->closeShowCategory(); } } - + /** * Don't return a 404 for categories in use. */ function hasViewableContent() { - if( parent::hasViewableContent() ) { + if ( parent::hasViewableContent() ) { return true; } else { $cat = Category::newFromTitle( $this->mTitle ); return $cat->getId() != 0; } - } function openShowCategory() { @@ -86,7 +85,7 @@ class CategoryViewer { * @private */ function getHTML() { - global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit; + global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit, $wgContLang; wfProfileIn( __METHOD__ ); $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery; @@ -95,11 +94,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 == '' ) { @@ -107,7 +117,7 @@ class CategoryViewer { } wfProfileOut( __METHOD__ ); - return $r; + return $wgContLang->convert( $r ); } function clearCategoryState() { @@ -115,7 +125,7 @@ class CategoryViewer { $this->articles_start_char = array(); $this->children = array(); $this->children_start_char = array(); - if( $this->showGallery ) { + if ( $this->showGallery ) { $this->gallery = new ImageGallery(); $this->gallery->setHideBadImages(); } @@ -138,14 +148,18 @@ class CategoryViewer { } /** - * Add a subcategory to the internal lists, using a title object + * 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 ); } @@ -160,7 +174,7 @@ class CategoryViewer { function getSubcategorySortChar( $title, $sortkey ) { global $wgContLang; - if( $title->getPrefixedText() == $sortkey ) { + if ( $title->getPrefixedText() == $sortkey ) { $firstChar = $wgContLang->firstChar( $title->getDBkey() ); } else { $firstChar = $wgContLang->firstChar( $sortkey ); @@ -174,7 +188,7 @@ class CategoryViewer { */ function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) { if ( $this->showGallery ) { - if( $this->flip ) { + if ( $this->flip ) { $this->gallery->insert( $title ); } else { $this->gallery->add( $title ); @@ -189,15 +203,21 @@ class CategoryViewer { */ function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) { global $wgContLang; - $titletext = $wgContLang->convert( $title->getPrefixedText() ); $this->articles[] = $isRedirect - ? '' . $this->getSkin()->makeKnownLinkObj( $title, $titletext ) . '' - : $this->getSkin()->makeSizeLinkObj( $pageLength, $title, $titletext ); + ? '' . + $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 ) { + 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 ); @@ -207,16 +227,17 @@ class CategoryViewer { function doCategoryQuery() { $dbr = wfGetDB( DB_SLAVE, 'category' ); - if( $this->from != '' ) { + if ( $this->from != '' ) { $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $this->from ); $this->flip = false; - } elseif( $this->until != '' ) { + } elseif ( $this->until != '' ) { $pageCondition = 'cl_sortkey < ' . $dbr->addQuotes( $this->until ); $this->flip = true; } else { $pageCondition = '1 = 1'; $this->flip = false; } + $res = $dbr->select( array( 'page', 'categorylinks', 'category' ), array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey', @@ -232,8 +253,9 @@ class CategoryViewer { $count = 0; $this->nextPage = null; - while( $x = $dbr->fetchObject ( $res ) ) { - if( ++$count > $this->limit ) { + + 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... $this->nextPage = $x->cl_sortkey; @@ -242,26 +264,20 @@ class CategoryViewer { $title = Title::makeTitle( $x->page_namespace, $x->page_title ); - if( $title->getNamespace() == NS_CATEGORY ) { + 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 ) { + } 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; } @@ -272,7 +288,8 @@ class CategoryViewer { $rescnt = count( $this->children ); $dbcnt = $this->cat->getSubcatCount(); $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'subcat' ); - if( $rescnt > 0 ) { + + if ( $rescnt > 0 ) { # Showing subcategories $r .= "
\n"; $r .= '

' . wfMsg( 'subcategories' ) . "

\n"; @@ -297,7 +314,7 @@ class CategoryViewer { $rescnt = count( $this->articles ); $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' ); - if( $rescnt > 0 ) { + if ( $rescnt > 0 ) { $r = "
\n"; $r .= '

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

\n"; $r .= $countmsg; @@ -308,7 +325,7 @@ class CategoryViewer { } function getImageSection() { - if( $this->showGallery && ! $this->gallery->isEmpty() ) { + if ( $this->showGallery && ! $this->gallery->isEmpty() ) { $dbcnt = $this->cat->getFileCount(); $rescnt = $this->gallery->count(); $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' ); @@ -322,9 +339,9 @@ class CategoryViewer { } function getCategoryBottom() { - if( $this->until != '' ) { + if ( $this->until != '' ) { return $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit ); - } elseif( $this->nextPage != '' || $this->from != '' ) { + } elseif ( $this->nextPage != '' || $this->from != '' ) { return $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit ); } else { return ''; @@ -344,7 +361,7 @@ class CategoryViewer { 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 ); } @@ -355,61 +372,60 @@ class CategoryViewer { * Format a list of articles chunked by letter in a three-column * list, ordered vertically. * + * 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 .= '
  • '; + $ret .= implode( "
    • \n
  • ", $articles ); + $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; } /** @@ -421,10 +437,10 @@ class CategoryViewer { */ function shortList( $articles, $articles_start_char ) { $r = '

' . htmlspecialchars( $articles_start_char[0] ) . "

\n"; - $r .= '
  • '.$articles[0].'
    • '; - for ($index = 1; $index < count($articles); $index++ ) + $r .= '
    • ' . $articles[0] . '
      • '; + for ( $index = 1; $index < count( $articles ); $index++ ) { - if ($articles_start_char[$index] != $articles_start_char[$index - 1]) + if ( $articles_start_char[$index] != $articles_start_char[$index - 1] ) { $r .= "

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

    \n
      "; } @@ -450,14 +466,29 @@ class CategoryViewer { $limitText = $wgLang->formatNum( $limit ); $prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText ); - if( $first != '' ) { - $prevLink = $sk->makeLinkObj( $title, $prevLink, - wfArrayToCGI( $query + array( 'until' => $first ) ) ); + + if ( $first != '' ) { + $prevQuery = $query; + $prevQuery['until'] = $first; + $prevLink = $sk->linkKnown( + $title, + $prevLink, + array(), + $prevQuery + ); } + $nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText ); - if( $last != '' ) { - $nextLink = $sk->makeLinkObj( $title, $nextLink, - wfArrayToCGI( $query + array( 'from' => $last ) ) ); + + if ( $last != '' ) { + $lastQuery = $query; + $lastQuery['from'] = $last; + $nextLink = $sk->linkKnown( + $title, + $nextLink, + array(), + $lastQuery + ); } return "($prevLink) ($nextLink)"; @@ -490,12 +521,14 @@ class CategoryViewer { # 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)){ + ( $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){ + } 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 @@ -504,10 +537,14 @@ class CategoryViewer { $this->cat->refreshCounts(); } else { # Case 3: hopeless. Don't give a total count at all. - return wfMsgExt("category-$type-count-limited", 'parse', + return wfMsgExt( "category-$type-count-limited", 'parse', $wgLang->formatNum( $rescnt ) ); } - return wfMsgExt( "category-$type-count", 'parse', $wgLang->formatNum( $rescnt ), - $wgLang->formatNum( $totalcnt ) ); + return wfMsgExt( + "category-$type-count", + 'parse', + $wgLang->formatNum( $rescnt ), + $wgLang->formatNum( $totalcnt ) + ); } } -- cgit v1.2.2