X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=bb08cf518eba3d9774bbcde4bdecda89df4af90b;hb=41ac01dfc839b4f1c32a354fe37ed064b8a31585;hp=447a141207056be1fef5282f05aafabfe25693ec;hpb=04f68827d0e3e53ba2924ff7e9f67f6a7e485656;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index 447a141207..bb08cf518e 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -1,91 +1,149 @@ getVal( 'diff' ); $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) ); - if ( isset( $diff ) && $diffOnly ) - return Article::view(); + if ( isset( $diff ) && $diffOnly ) { + return parent::view(); + } - if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) + if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) { return; + } if ( NS_CATEGORY == $this->mTitle->getNamespace() ) { $this->openShowCategory(); } - Article::view(); + parent::view(); 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 } function closeShowCategory() { global $wgOut, $wgRequest; - $from = $wgRequest->getVal( 'from' ); - $until = $wgRequest->getVal( 'until' ); - $viewer = new CategoryViewer( $this->mTitle, $from, $until ); + // Use these as defaults for back compat --catrope + $oldFrom = $wgRequest->getVal( 'from' ); + $oldUntil = $wgRequest->getVal( 'until' ); + + $from = $until = array(); + foreach ( array( 'page', 'subcat', 'file' ) as $type ) { + $from[$type] = $wgRequest->getVal( "{$type}from", $oldFrom ); + $until[$type] = $wgRequest->getVal( "{$type}until", $oldUntil ); + } + + $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() ); $wgOut->addHTML( $viewer->getHTML() ); } } class CategoryViewer { - var $title, $limit, $from, $until, + var $limit, $from, $until, $articles, $articles_start_char, $children, $children_start_char, - $showGallery, $gallery, - $skin; - /** Category object for this page */ + $showGallery, $imgsNoGalley, + $imgsNoGallery_start_char, + $imgsNoGallery; + + /** + * @var + */ + var $nextPage; + + /** + * @var Array + */ + var $flip; + + /** + * @var Title + */ + var $title; + + /** + * @var Collation + */ + var $collation; + + /** + * @var ImageGallery + */ + var $gallery; + + /** + * Category object for this page + * @var Category + */ private $cat; - function __construct( $title, $from = '', $until = '' ) { + /** + * The original query array, to be used in generating paging links. + * @var array + */ + private $query; + + function __construct( $title, $from = '', $until = '', $query = array() ) { global $wgCategoryPagingLimit; $this->title = $title; $this->from = $from; $this->until = $until; $this->limit = $wgCategoryPagingLimit; $this->cat = Category::newFromTitle( $title ); + $this->query = $query; + $this->collation = Collation::singleton(); + unset( $this->query['title'] ); } /** * Format the category data list. * * @return string HTML output - * @private */ - function getHTML() { - global $wgOut, $wgCategoryMagicGallery, $wgContLang; + public function getHTML() { + global $wgOut, $wgCategoryMagicGallery; wfProfileIn( __METHOD__ ); $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery; @@ -101,7 +159,7 @@ class CategoryViewer { 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 + // @todo FIXME: Cannot be completely suppressed because it // is unknown if 'until' or 'from' makes this // give 0 results. $r = $r . $this->getCategoryTop(); @@ -114,10 +172,16 @@ class CategoryViewer { // Give a proper message if category is empty if ( $r == '' ) { $r = wfMsgExt( 'category-empty', array( 'parse' ) ); + } else { + $pageLang = $this->title->getPageLanguage(); + $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() ); + # close the previous div, show the headings in user language, + # then open a new div with the page content language again + $r = '' . $r . Html::openElement( 'div', $langAttribs ); } wfProfileOut( __METHOD__ ); - return $wgContLang->convert( $r ); + return $r; } function clearCategoryState() { @@ -128,40 +192,38 @@ class CategoryViewer { if ( $this->showGallery ) { $this->gallery = new ImageGallery(); $this->gallery->setHideBadImages(); + } else { + $this->imgsNoGallery = array(); + $this->imgsNoGallery_start_char = array(); } } - 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 ) { + function addSubcategoryObject( Category $cat, $sortkey, $pageLength ) { + // Subcategory; strip the 'Category' namespace from the link text. $title = $cat->getTitle(); - $this->addSubcategory( $title, $sortkey, $pageLength ); + + $link = Linker::link( $title, htmlspecialchars( $title->getText() ) ); + if ( $title->isRedirect() ) { + // This didn't used to add redirect-in-category, but might + // as well be consistent with the rest of the sections + // on a category page. + $link = '' . $link . ''; + } + $this->children[] = $link; + + $this->children_start_char[] = + $this->getSubcategorySortChar( $cat->getTitle(), $sortkey ); } /** * Add a subcategory to the internal lists, using a title object - * @deprecated kept for compatibility, please use addSubcategoryObject instead + * @deprecated since 1.17 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 ); + function addSubcategory( Title $title, $sortkey, $pageLength ) { + $this->addSubcategoryObject( Category::newFromTitle( $title ), $sortkey, $pageLength ); } /** @@ -170,9 +232,12 @@ class CategoryViewer { * 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... + * + * @param Title $title + * @param string $sortkey The human-readable sortkey (before transforming to icu or whatever). */ function getSubcategorySortChar( $title, $sortkey ) { - global $wgContLang, $wgExperimentalCategorySort; + global $wgContLang; if ( $title->getPrefixedText() == $sortkey ) { $word = $title->getDBkey(); @@ -180,11 +245,7 @@ class CategoryViewer { $word = $sortkey; } - if ( $wgExperimentalCategorySort ) { - $firstChar = $wgContLang->firstLetterForLists( $word ); - } else { - $firstChar = $wgContLang->firstChar( $word ); - } + $firstChar = $this->collation->getFirstLetter( $word ); return $wgContLang->convert( $firstChar ); } @@ -193,14 +254,25 @@ class CategoryViewer { * Add a page in the image namespace */ function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) { + global $wgContLang; if ( $this->showGallery ) { - if ( $this->flip ) { + $flip = $this->flip['file']; + if ( $flip ) { $this->gallery->insert( $title ); } else { $this->gallery->add( $title ); } } else { - $this->addPage( $title, $sortkey, $pageLength, $isRedirect ); + $link = Linker::link( $title ); + if ( $isRedirect ) { + // This seems kind of pointless given 'mw-redirect' class, + // but keeping for back-compatibility with user css. + $link = '' . $link . ''; + } + $this->imgsNoGallery[] = $link; + + $this->imgsNoGallery_start_char[] = $wgContLang->convert( + $this->collation->getFirstLetter( $sortkey ) ); } } @@ -208,130 +280,105 @@ class CategoryViewer { * Add a miscellaneous page */ function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) { - global $wgContLang, $wgExperimentalCategorySort; - $this->articles[] = $isRedirect - ? '' . - $this->getSkin()->link( - $title, - null, - array(), - array(), - array( 'known', 'noclasses' ) - ) . '' - : $this->getSkin()->makeSizeLinkObj( $pageLength, $title ); - - if ( $wgExperimentalCategorySort ) { - $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstLetterForLists( $sortkey ) ); - } else { - $this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) ); + global $wgContLang; + + $link = Linker::link( $title ); + if ( $isRedirect ) { + // This seems kind of pointless given 'mw-redirect' class, + // but keeping for back-compatiability with user css. + $link = '' . $link . ''; } + $this->articles[] = $link; + + $this->articles_start_char[] = $wgContLang->convert( + $this->collation->getFirstLetter( $sortkey ) ); } function finaliseCategoryState() { - if ( $this->flip ) { + if ( $this->flip['subcat'] ) { $this->children = array_reverse( $this->children ); $this->children_start_char = array_reverse( $this->children_start_char ); + } + if ( $this->flip['page'] ) { $this->articles = array_reverse( $this->articles ); $this->articles_start_char = array_reverse( $this->articles_start_char ); } + if ( !$this->showGallery && $this->flip['file'] ) { + $this->imgsNoGallery = array_reverse( $this->imgsNoGallery ); + $this->imgsNoGallery_start_char = array_reverse( $this->imgsNoGallery_start_char ); + } } function doCategoryQuery() { - global $wgExperimentalCategorySort; - $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'; - $this->flip = false; - } - - $tables = array( 'page', 'categorylinks', 'category' ); - $fields = array( 'page_title', 'page_namespace', 'page_len', - 'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title', - 'cat_subcats', 'cat_pages', 'cat_files' ); - $conds = array( 'cl_to' => $this->title->getDBkey() ); - $opts = array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : - 'cl_sortkey', 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ) ); - $joins = array( 'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ), - 'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ); - - if ( $wgExperimentalCategorySort ) { - # Copy-pasted from below, but that's okay, because the stuff below - # will be deleted when this becomes the default. - $count = 0; - $this->nextPage = null; - - foreach ( array( 'page', 'subcat', 'file' ) as $type ) { - $res = $dbr->select( - $tables, - array_merge( $fields, array( 'cl_raw_sortkey' ) ), - $conds + array( 'cl_type' => $type ) + ( $type == 'page' ? array( $pageCondition ) : array() ), - __METHOD__, - $opts + ( $type == 'page' ? array( 'LIMIT' => $this->limit + 1 ) : array() ), - $joins - ); - - foreach ( $res as $row ) { - if ( $type == 'page' && ++$count > $this->limit ) { - # We've reached the one extra which shows that there - # are additional pages to be had. Stop here... - $this->nextPage = $row->cl_sortkey; - break; - } - - $title = Title::newFromRow( $row ); - - if ( $title->getNamespace() == NS_CATEGORY ) { - $cat = Category::newFromRow( $row, $title ); - $this->addSubcategoryObject( $cat, $row->cl_raw_sortkey, $row->page_len ); - } elseif ( $this->showGallery && $title->getNamespace() == NS_FILE ) { - $this->addImage( $title, $row->cl_raw_sortkey, $row->page_len, $row->page_is_redirect ); - } else { - $this->addPage( $title, $row->cl_raw_sortkey, $row->page_len, $row->page_is_redirect ); - } - } - } - return; - } - - # Non-$wgExperimentalCategorySort stuff - - $res = $dbr->select( - $tables, - $fields, - $conds + array( $pageCondition ), - __METHOD__, - $opts + array( 'LIMIT' => $this->limit + 1 ), - $joins + $this->nextPage = array( + 'page' => null, + 'subcat' => null, + 'file' => null, ); + $this->flip = array( 'page' => false, 'subcat' => false, 'file' => false ); + + foreach ( array( 'page', 'subcat', 'file' ) as $type ) { + # Get the sortkeys for start/end, if applicable. Note that if + # the collation in the database differs from the one + # set in $wgCategoryCollation, pagination might go totally haywire. + $extraConds = array( 'cl_type' => $type ); + if ( $this->from[$type] !== null ) { + $extraConds[] = 'cl_sortkey >= ' + . $dbr->addQuotes( $this->collation->getSortKey( $this->from[$type] ) ); + } elseif ( $this->until[$type] !== null ) { + $extraConds[] = 'cl_sortkey < ' + . $dbr->addQuotes( $this->collation->getSortKey( $this->until[$type] ) ); + $this->flip[$type] = true; + } - $count = 0; - $this->nextPage = null; + $res = $dbr->select( + array( 'page', 'categorylinks', 'category' ), + array( 'page_id', 'page_title', 'page_namespace', 'page_len', + 'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title', + 'cat_subcats', 'cat_pages', 'cat_files', + 'cl_sortkey_prefix', 'cl_collation' ), + array_merge( array( 'cl_to' => $this->title->getDBkey() ), $extraConds ), + __METHOD__, + array( + 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ), + 'LIMIT' => $this->limit + 1, + 'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey', + ), + array( + 'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ), + 'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) + ) + ); - foreach ( $res as $row ) { - if ( ++$count > $this->limit ) { - // We've reached the one extra which shows that there are - // additional pages to be had. Stop here... - $this->nextPage = $row->cl_sortkey; - break; - } + $count = 0; + foreach ( $res as $row ) { + $title = Title::newFromRow( $row ); + if ( $row->cl_collation === '' ) { + // Hack to make sure that while updating from 1.16 schema + // and db is inconsistent, that the sky doesn't fall. + // See r83544. Could perhaps be removed in a couple decades... + $humanSortkey = $row->cl_sortkey; + } else { + $humanSortkey = $title->getCategorySortkey( $row->cl_sortkey_prefix ); + } - $title = Title::newFromRow( $row ); + if ( ++$count > $this->limit ) { + # We've reached the one extra which shows that there + # are additional pages to be had. Stop here... + $this->nextPage[$type] = $humanSortkey; + break; + } - if ( $title->getNamespace() == NS_CATEGORY ) { - $cat = Category::newFromRow( $row, $title ); - $this->addSubcategoryObject( $cat, $row->cl_sortkey, $row->page_len ); - } elseif ( $this->showGallery && $title->getNamespace() == NS_FILE ) { - $this->addImage( $title, $row->cl_sortkey, $row->page_len, $row->page_is_redirect ); - } else { - $this->addPage( $title, $row->cl_sortkey, $row->page_len, $row->page_is_redirect ); + if ( $title->getNamespace() == NS_CATEGORY ) { + $cat = Category::newFromRow( $row, $title ); + $this->addSubcategoryObject( $cat, $humanSortkey, $row->page_len ); + } elseif ( $title->getNamespace() == NS_FILE ) { + $this->addImage( $title, $humanSortkey, $row->page_len, $row->page_is_redirect ); + } else { + $this->addPage( $title, $humanSortkey, $row->page_len, $row->page_is_redirect ); + } } } } @@ -355,7 +402,9 @@ class CategoryViewer { $r .= "
\n"; $r .= '

' . wfMsg( 'subcategories' ) . "

\n"; $r .= $countmsg; + $r .= $this->getSectionPagingLinks( 'subcat' ); $r .= $this->formatList( $this->children, $this->children_start_char ); + $r .= $this->getSectionPagingLinks( 'subcat' ); $r .= "\n
"; } return $r; @@ -366,7 +415,7 @@ class CategoryViewer { # Don't show articles section if there are none. $r = ''; - # FIXME, here and in the other two sections: we don't need to bother + # @todo 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. @@ -379,36 +428,57 @@ class CategoryViewer { $r = "
\n"; $r .= '

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

\n"; $r .= $countmsg; + $r .= $this->getSectionPagingLinks( 'page' ); $r .= $this->formatList( $this->articles, $this->articles_start_char ); + $r .= $this->getSectionPagingLinks( 'page' ); $r .= "\n
"; } return $r; } function getImageSection() { - if ( $this->showGallery && ! $this->gallery->isEmpty() ) { + $r = ''; + $rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery ); + if ( $rescnt > 0 ) { $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 ''; + $r .= "
\n"; + $r .= '

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

\n"; + $r .= $countmsg; + $r .= $this->getSectionPagingLinks( 'file' ); + if ( $this->showGallery ) { + $r .= $this->gallery->toHTML(); + } else { + $r .= $this->formatList( $this->imgsNoGallery, $this->imgsNoGallery_start_char ); + } + $r .= $this->getSectionPagingLinks( 'file' ); + $r .= "\n
"; } + return $r; } - 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 ); + /** + * Get the paging links for a section (subcats/pages/files), to go at the top and bottom + * of the output. + * + * @param $type String: 'page', 'subcat', or 'file' + * @return String: HTML output, possibly empty if there are no other pages + */ + private function getSectionPagingLinks( $type ) { + if ( $this->until[$type] !== null ) { + return $this->pagingLinks( $this->nextPage[$type], $this->until[$type], $type ); + } elseif ( $this->nextPage[$type] !== null || $this->from[$type] !== null ) { + return $this->pagingLinks( $this->from[$type], $this->nextPage[$type], $type ); } else { return ''; } } + function getCategoryBottom() { + return ''; + } + /** * Format a list of articles chunked by letter, either as a * bullet list or a columnar format, depending on the length. @@ -420,13 +490,20 @@ class CategoryViewer { * @private */ function formatList( $articles, $articles_start_char, $cutoff = 6 ) { + $list = ''; if ( count ( $articles ) > $cutoff ) { - return $this->columnList( $articles, $articles_start_char ); + $list = self::columnList( $articles, $articles_start_char ); } elseif ( count( $articles ) > 0 ) { // for short lists of articles in categories. - return $this->shortList( $articles, $articles_start_char ); + $list = self::shortList( $articles, $articles_start_char ); } - return ''; + + $pageLang = $this->title->getPageLanguage(); + $attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(), + 'class' => 'mw-content-'.$pageLang->getDir() ); + $list = Html::rawElement( 'div', $attribs, $list ); + + return $list; } /** @@ -444,7 +521,7 @@ class CategoryViewer { * @return String * @private */ - function columnList( $articles, $articles_start_char ) { + static function columnList( $articles, $articles_start_char ) { $columns = array_combine( $articles, $articles_start_char ); # Split into three columns $columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ ); @@ -496,13 +573,11 @@ class CategoryViewer { * @return String * @private */ - function shortList( $articles, $articles_start_char ) { + static function shortList( $articles, $articles_start_char ) { $r = '

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

\n"; $r .= '

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

\n