X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=911f01702849a0c565e180fc55abbf6028aa9d18;hb=f964df3f43dd71b4a0fb494b20eb83babcc5e00d;hp=5070c1bde7c14ff4fc3aa5735e68bb6c10830ef9;hpb=a1c7efaeeb6f5f5069a223345971ea5d9d07348c;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 5070c1bde7..911f017028 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -5,6 +5,13 @@
*
* @package MediaWiki
*/
+
+if( !defined( 'MEDIAWIKI' ) )
+ die();
+
+if( $wgCategoryMagicGallery )
+ /** */
+ require_once('ImageGallery.php');
/**
* @package MediaWiki
@@ -31,262 +38,290 @@ class CategoryPage extends Article {
# 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.
+ # 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;
- $msg = wfMsg('usenewcategorypage');
- if ( '0' == @$msg[0] )
- {
- $wgOut->addHTML( $this->oldCategoryMagic() );
- } else {
- $wgOut->addHTML( $this->newCategoryMagic() );
- }
+ global $wgOut, $wgRequest;
+ $pageConditions = array();
+ $from = $wgRequest->getVal( 'from' );
+ $until = $wgRequest->getVal( 'until' );
+ $wgOut->addHTML( $this->doCategoryMagic( $from, $until ) );
}
- # This method generates the list of subcategories and pages for a category
- function oldCategoryMagic () {
- global $wgLang, $wgUser ;
- $fname = 'CategoryPage::oldCategoryMagic';
-
+ /**
+ * 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
+ */
+ 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();
+ }
- $sk =& $wgUser->getSkin() ;
+ $dbr =& wfGetDB( DB_SLAVE );
+ if( $from != '' ) {
+ $pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $from );
+ $flip = false;
+ } elseif( $until != '' ) {
+ $pageCondition = 'cl_sortkey < ' . $dbr->addQuotes( $until );
+ $flip = true;
+ } else {
+ $pageCondition = '1';
+ $flip = false;
+ }
+ $limit = 200;
+ $res = $dbr->select(
+ array( 'page', 'categorylinks' ),
+ array( 'page_title', 'page_namespace', '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";
+ $count = 0;
+ $nextPage = null;
+ while( $x = $dbr->fetchObject ( $res ) ) {
+ if( ++$count > $limit ) {
+ // We've reached the one extra which shows that there are
+ // additional pages to be had. Stop here...
+ $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, $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...
+ if( $title->getPrefixedText() == $x->cl_sortkey ) {
+ array_push( $children_start_char, $wgContLang->firstChar( $x->page_title ) );
+ } else {
+ array_push( $children_start_char, $wgContLang->firstChar( $x->cl_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 ) );
+ }
+ } else {
+ // Page in this category
+ array_push( $articles, $sk->makeKnownLinkObj( $title ) ) ;
+ array_push( $articles_start_char, $wgContLang->firstChar( $x->cl_sortkey ) ) ;
+ }
+ }
+ $dbr->freeResult( $res );
- $articles = array() ;
- $children = array() ;
- $r = '';
- $id = $this->mTitle->getArticleID() ;
+ 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 );
+ }
+
+ # Don't show subcategories section if there are none.
+ if( count( $children ) > 0 ) {
+ # Showing subcategories
+ $r .= '
' . wfMsg( 'subcategories' ) . "
\n";
+ $r .= $this->formatCount( $children, 'subcategorycount' );
+ $r .= $this->formatList( $children, $children_start_char );
+ }
- # FIXME: add limits
- $dbr =& wfGetDB( DB_SLAVE );
- $cur = $dbr->tableName( 'cur' );
- $categorylinks = $dbr->tableName( 'categorylinks' );
+ # 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 );
- $t = $dbr->strencode( $this->mTitle->getDBKey() );
- $sql = "SELECT DISTINCT cur_title,cur_namespace FROM $cur,$categorylinks " .
- "WHERE cl_to='$t' AND cl_from=cur_id ORDER BY cl_sortkey" ;
- $res = $dbr->query( $sql, $fname ) ;
- # For all pages that link to this category
- while ( $x = $dbr->fetchObject ( $res ) )
- {
- $t = $wgLang->getNsText ( $x->cur_namespace ) ;
- if ( $t != '' ) $t .= ':' ;
- $t .= $x->cur_title ;
+ if( $wgCategoryMagicGallery && ! $ig->isEmpty() ) {
+ $r.= $ig->toHTML();
+ }
- if ( $x->cur_namespace == NS_CATEGORY ) {
- array_push ( $children , $sk->makeLink ( $t ) ) ; # Subcategory
- } else {
- array_push ( $articles , $sk->makeLink ( $t ) ) ; # Page in this category
- }
- }
- $dbr->freeResult ( $res ) ;
+ wfProfileOut( $fname );
+ return $r;
+ }
- # Showing subcategories
- if ( count ( $children ) > 0 ) {
- $r .= ''.wfMsg('subcategories')."
\n" ;
- $r .= implode ( ', ' , $children ) ;
- }
+ /**
+ * @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';
+ }
+ 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
+ */
+ function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
+ if ( count ( $articles ) > $cutoff ) {
+ return $this->columnList( $articles, $articles_start_char );
+ } elseif ( count($articles) > 0) {
+ // for short lists of articles in categories.
+ return $this->shortList( $articles, $articles_start_char );
+ }
+ return '';
+ }
+
+ /**
+ * 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
+ */
+ function columnList( $articles, $articles_start_char ) {
+ // divide list into three equal chunks
+ $chunk = (int) (count ( $articles ) / 3);
+
+ // get and display header
+ $r = '';
+
+ $prev_start_char = 'none';
+
+ // loop through the chunks
+ for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
+ $chunkIndex < 3;
+ $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
+ {
+ $r .= "\n";
+ $atColumnTop = true;
+
+ // 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];
+ }
+
+ $r .= "- {$articles[$index]}
";
+ }
+ if( !$atColumnTop ) {
+ $r .= " \n";
+ }
+ $r .= " | \n";
- # Showing pages in this category
- if ( count ( $articles ) > 0 ) {
- $ti = $this->mTitle->getText() ;
- $h = wfMsg( 'category_header', $ti );
- $r .= "$h
\n" ;
- $r .= implode ( ', ' , $articles ) ;
- }
- return $r ;
+ }
+ $r .= '
';
+ return $r;
}
+
+ /**
+ * Format a list of articles chunked by letter in a bullet list.
+ * @param array $articles
+ * @param array $articles_start_char
+ * @return string
+ * @access private
+ */
+ function shortList( $articles, $articles_start_char ) {
+ $r = ''.$articles_start_char[0]."
\n";
+ $r .= '- '.$articles[0].'
';
+ for ($index = 1; $index < count($articles); $index++ )
+ {
+ if ($articles_start_char[$index] != $articles_start_char[$index - 1])
+ {
+ $r .= "
{$articles_start_char[$index]}
\n";
+ }
- function newCategoryMagic () {
- global $wgLang,$wgUser;
-
+ $r .= "- {$articles[$index]}
";
+ }
+ $r .= '
';
+ return $r;
+ }
+
+ /**
+ * @param Title $title
+ * @param string $first
+ * @param string $last
+ * @param int $limit
+ * @param array $query - additional query options to pass
+ * @return string
+ * @access private
+ */
+ function pagingLinks( $title, $first, $last, $limit, $query = array() ) {
+ global $wgUser, $wgLang;
$sk =& $wgUser->getSkin();
+ $limitText = $wgLang->formatNum( $limit );
+
+ $prevLink = htmlspecialchars( wfMsg( 'prevn', $limitText ) );
+ if( $first != '' ) {
+ $prevLink = $sk->makeLinkObj( $title, $prevLink,
+ wfArrayToCGI( $query + array( 'until' => $first ) ) );
+ }
+ $nextLink = htmlspecialchars( wfMsg( 'nextn', $limitText ) );
+ if( $last != '' ) {
+ $nextLink = $sk->makeLinkObj( $title, $nextLink,
+ wfArrayToCGI( $query + array( 'from' => $last ) ) );
+ }
+
+ return "($prevLink) ($nextLink)";
+ }
+}
- $r = "
\n";
-
- $articles = array() ;
- $articles_start_char = array();
- $children = array() ;
- $children_start_char = array();
- $data = array () ;
- $id = $this->mTitle->getArticleID() ;
-
- # FIXME: add limits
- $dbr =& wfGetDB( DB_SLAVE );
- $cur = $dbr->tableName( 'cur' );
- $categorylinks = $dbr->tableName( 'categorylinks' );
-
- $t = $dbr->strencode( $this->mTitle->getDBKey() );
- $sql = "SELECT DISTINCT cur_title,cur_namespace,cl_sortkey FROM " .
- "$cur,$categorylinks WHERE cl_to='$t' AND cl_from=cur_id ORDER BY cl_sortkey" ;
- $res = $dbr->query ( $sql ) ;
- while ( $x = $dbr->fetchObject ( $res ) )
- {
- $t = $ns = $wgLang->getNsText ( $x->cur_namespace ) ;
- if ( $t != '' ) $t .= ':' ;
- $t .= $x->cur_title ;
-
- if ( $x->cur_namespace == NS_CATEGORY ) {
- $ctitle = str_replace( '_',' ',$x->cur_title );
- array_push ( $children, $sk->makeKnownLink ( $t, $ctitle ) ) ; # Subcategory
-
- // 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...
- if ( ($ns.':'.$ctitle) == $x->cl_sortkey ) {
- array_push ( $children_start_char, $wgLang->firstChar( $x->cur_title ) );
- } else {
- array_push ( $children_start_char, $wgLang->firstChar( $x->cl_sortkey ) ) ;
- }
- } else {
- array_push ( $articles , $sk->makeKnownLink ( $t ) ) ; # Page in this category
- array_push ( $articles_start_char, $wgLang->firstChar( $x->cl_sortkey ) ) ;
- }
- }
- $dbr->freeResult ( $res ) ;
-
- $ti = $this->mTitle->getText() ;
-
- # Don't show subcategories section if there are none.
- if ( count ( $children ) > 0 )
- {
- # Showing subcategories
- $r .= '' . wfMsg( 'subcategories' ) . "
\n";
-
- $numchild = count( $children );
- if($numchild == 1) {
- $r .= wfMsg( 'subcategorycount1', 1 );
- } else {
- $r .= wfMsg( 'subcategorycount' , $numchild );
- }
- unset($numchild);
-
- if ( count ( $children ) > 6 ) {
-
- // divide list into three equal chunks
- $chunk = (int) (count ( $children ) / 3);
-
- // get and display header
- $r .= '';
-
- $startChunk = 0;
- $endChunk = $chunk;
-
- // loop through the chunks
- for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
- $chunkIndex < 3;
- $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
- {
-
- $r .= '';
- // output all subcategories to category
- for ($index = $startChunk ;
- $index < $endChunk && $index < count($children);
- $index++ )
- {
- // check for change of starting letter or begging of chunk
- if ( ($index == $startChunk)
- || ($children_start_char[$index] != $children_start_char[$index - 1]) )
- {
- $r .= " {$children_start_char[$index]}\n";
- }
-
- $r .= "- {$children[$index]}
";
- }
- $r .= ' | ';
-
-
- }
- $r .= '
';
- } else {
- // for short lists of subcategories to category.
-
- $r .= "{$children_start_char[0]}
\n";
- $r .= '- '.$children[0].'
';
- for ($index = 1; $index < count($children); $index++ )
- {
- if ($children_start_char[$index] != $children_start_char[$index - 1])
- {
- $r .= "
{$children_start_char[$index]}
\n";
- }
- $r .= "- {$children[$index]}
";
- }
- $r .= '
';
- }
- } # END of if ( count($children) > 0 )
-
- $r .= '' . wfMsg( 'category_header', $ti ) . "
\n";
-
- $numart = count( $articles );
- if($numart == 1) {
- $r .= wfMsg( 'categoryarticlecount1', 1 );
- } else {
- $r .= wfMsg( 'categoryarticlecount' , $numart );
- }
- unset($numart);
-
- # Showing articles in this category
- if ( count ( $articles ) > 6) {
- $ti = $this->mTitle->getText() ;
-
- // divide list into three equal chunks
- $chunk = (int) (count ( $articles ) / 3);
-
- // get and display header
- $r .= '';
-
- // loop through the chunks
- for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
- $chunkIndex < 3;
- $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
- {
-
- $r .= '';
-
- // output all articles in category
- for ($index = $startChunk ;
- $index < $endChunk && $index < count($articles);
- $index++ )
- {
- // check for change of starting letter or begging of chunk
- if ( ($index == $startChunk) ||
- ($articles_start_char[$index] != $articles_start_char[$index - 1]) )
-
- {
- $r .= " {$articles_start_char[$index]}\n";
- }
-
- $r .= "- {$articles[$index]}
";
- }
- $r .= ' | ';
-
-
- }
- $r .= '
';
- } elseif ( count($articles) > 0) {
- // for short lists of articles in categories.
- $ti = $this->mTitle->getText() ;
-
- $r .= ''.$articles_start_char[0]."
\n";
- $r .= '- '.$articles[0].'
';
- for ($index = 1; $index < count($articles); $index++ )
- {
- if ($articles_start_char[$index] != $articles_start_char[$index - 1])
- {
- $r .= "
{$articles_start_char[$index]}
\n";
- }
- $r .= "- {$articles[$index]}
";
- }
- $r .= '
';
- }
- return $r ;
- }
-}
?>