X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FQueryPage.php;h=ef675c0e53c473f14a6d45082e2034cb8ae52193;hb=957850f0da357337c24291a29d5ea0f08b5050a9;hp=cf3e0d03a053b42bb274d59da73cb973491215f6;hpb=dd082a7ff41d3bc57291c067e69fe4d904ddf960;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/QueryPage.php b/includes/QueryPage.php index cf3e0d03a0..ef675c0e53 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -85,6 +85,8 @@ abstract class QueryPage extends SpecialPage { */ protected $numRows; + protected $cachedTimestamp = null; + /** * Wheter to show prev/next links */ @@ -109,8 +111,7 @@ abstract class QueryPage extends SpecialPage { * join_conds => JOIN conditions * * Note that the query itself should return the following three columns: - * 'namespace', 'title', and 'value' - * *in that order*. 'value' is used for sorting. + * 'namespace', 'title', and 'value'. 'value' is used for sorting. * * These may be stored in the querycache table for expensive queries, * and that cached data will be returned sometimes, so the presence of @@ -129,14 +130,14 @@ abstract class QueryPage extends SpecialPage { function getQueryInfo() { return null; } - + /** * For back-compat, subclasses may return a raw SQL query here, as a string. * This is stronly deprecated; getQueryInfo() should be overridden instead. * @return string - * @deprecated since 1.18 */ function getSQL() { + /* Implement getQueryInfo() instead */ throw new MWException( "Bug in a QueryPage: doesn't implement getQueryInfo() nor getQuery() properly" ); } @@ -273,7 +274,7 @@ abstract class QueryPage extends SpecialPage { if ( !$this->isCacheable() ) { return 0; } - + $fname = get_class( $this ) . '::recache'; $dbw = wfGetDB( DB_MASTER ); $dbr = wfGetDB( DB_SLAVE, array( $this->getName(), __METHOD__, 'vslow' ) ); @@ -374,15 +375,15 @@ abstract class QueryPage extends SpecialPage { $sql = $this->getSQL(); $sql .= ' ORDER BY ' . implode( ', ', $order ); $sql = $dbr->limitResult( $sql, $limit, $offset ); - $res = $dbr->query( $sql ); + $res = $dbr->query( $sql, $fname ); } return $dbr->resultObject( $res ); } /** - * Parameters and order changed in 1.18 + * Somewhat deprecated, you probably want to be using execute() */ - function doQuery( $limit, $offset = false ) { + function doQuery( $offset = false, $limit = false ) { if ( $this->isCached() && $this->isCacheable() ) { return $this->fetchFromCache( $limit, $offset ); } else { @@ -406,6 +407,11 @@ abstract class QueryPage extends SpecialPage { if ( $offset !== false ) { $options['OFFSET'] = intval( $offset ); } + if ( $this->sortDescending() ) { + $options['ORDER BY'] = 'qc_value DESC'; + } else { + $options['ORDER BY'] = 'qc_value ASC'; + } $res = $dbr->select( 'querycache', array( 'qc_type', 'qc_namespace AS namespace', 'qc_title AS title', @@ -416,30 +422,38 @@ abstract class QueryPage extends SpecialPage { return $dbr->resultObject( $res ); } + public function getCachedTimestamp() { + if ( is_null( $this->cachedTimestamp ) ) { + $dbr = wfGetDB( DB_SLAVE ); + $fname = get_class( $this ) . '::getCachedTimestamp'; + $this->cachedTimestamp = $dbr->selectField( 'querycache_info', 'qci_timestamp', + array( 'qci_type' => $this->getName() ), $fname ); + } + return $this->cachedTimestamp; + } + /** * This is the actual workhorse. It does everything needed to make a * real, honest-to-gosh query page. */ function execute( $par ) { - global $wgUser, $wgOut, $wgLang; - - if ( !$this->userCanExecute( $wgUser ) ) { + if ( !$this->userCanExecute( $this->getUser() ) ) { $this->displayRestrictionError(); return; } - if ( $this->limit == 0 && $this->offset == 0 ) - list( $this->limit, $this->offset ) = wfCheckLimits(); - $sname = $this->getName(); - $fname = get_class( $this ) . '::doQuery'; + if ( $this->limit == 0 && $this->offset == 0 ) { + list( $this->limit, $this->offset ) = $this->getRequest()->getLimitOffset(); + } $dbr = wfGetDB( DB_SLAVE ); $this->setHeaders(); - $wgOut->setSyndicated( $this->isSyndicated() ); + $out = $this->getOutput(); + $out->setSyndicated( $this->isSyndicated() ); if ( $this->isCached() && !$this->isCacheable() ) { - $wgOut->setSyndicated( false ); - $wgOut->addWikiMsg( 'querypage-disabled' ); + $out->setSyndicated( false ); + $out->addWikiMsg( 'querypage-disabled' ); return 0; } @@ -453,25 +467,25 @@ abstract class QueryPage extends SpecialPage { if ( !$this->listoutput ) { # Fetch the timestamp of this update - $tRes = $dbr->select( 'querycache_info', array( 'qci_timestamp' ), array( 'qci_type' => $sname ), $fname ); - $tRow = $dbr->fetchObject( $tRes ); - - if ( $tRow ) { - $updated = $wgLang->timeanddate( $tRow->qci_timestamp, true, true ); - $updateddate = $wgLang->date( $tRow->qci_timestamp, true, true ); - $updatedtime = $wgLang->time( $tRow->qci_timestamp, true, true ); - $wgOut->addMeta( 'Data-Cache-Time', $tRow->qci_timestamp ); - $wgOut->addInlineScript( "var dataCacheTime = '{$tRow->qci_timestamp}';" ); - $wgOut->addWikiMsg( 'perfcachedts', $updated, $updateddate, $updatedtime ); + $ts = $this->getCachedTimestamp(); + + if ( $ts ) { + $lang = $this->getLanguage(); + $updated = $lang->timeanddate( $ts, true, true ); + $updateddate = $lang->date( $ts, true, true ); + $updatedtime = $lang->time( $ts, true, true ); + $out->addMeta( 'Data-Cache-Time', $ts ); + $out->addInlineScript( "var dataCacheTime = '$ts';" ); + $out->addWikiMsg( 'perfcachedts', $updated, $updateddate, $updatedtime ); } else { - $wgOut->addWikiMsg( 'perfcached' ); + $out->addWikiMsg( 'perfcached' ); } # If updates on this page have been disabled, let the user know # that the data set won't be refreshed for now global $wgDisableQueryPageUpdate; if ( is_array( $wgDisableQueryPageUpdate ) && in_array( $this->getName(), $wgDisableQueryPageUpdate ) ) { - $wgOut->addWikiMsg( 'querypage-no-updates' ); + $out->addWikiMsg( 'querypage-no-updates' ); } } @@ -482,23 +496,23 @@ abstract class QueryPage extends SpecialPage { $this->preprocessResults( $dbr, $res ); - $wgOut->addHTML( Xml::openElement( 'div', array( 'class' => 'mw-spcontent' ) ) ); + $out->addHTML( Xml::openElement( 'div', array( 'class' => 'mw-spcontent' ) ) ); # Top header and navigation if ( $this->shownavigation ) { - $wgOut->addHTML( $this->getPageHeader() ); + $out->addHTML( $this->getPageHeader() ); if ( $this->numRows > 0 ) { - $wgOut->addHTML( '

' . wfShowingResults( $this->offset, $this->numRows ) . '

' ); + $out->addHTML( $this->msg( 'showingresults' )->numParams( + $this->numRows, $this->offset + 1 )->parseAsBlock() ); # Disable the "next" link when we reach the end - $paging = wfViewPrevNext( $this->offset, $this->limit, - $this->getTitle( $par ), - wfArrayToCGI( $this->linkParameters() ), ( $this->numRows < $this->limit ) ); - $wgOut->addHTML( '

' . $paging . '

' ); + $paging = $this->getLanguage()->viewPrevNext( $this->getTitle( $par ), $this->offset, + $this->limit, $this->linkParameters(), ( $this->numRows < $this->limit ) ); + $out->addHTML( '

' . $paging . '

' ); } else { # No results to show, so don't bother with "showing X of Y" etc. # -- just let the user know and give up now - $wgOut->addHTML( '

' . wfMsgHtml( 'specialpage-empty' ) . '

' ); - $wgOut->addHTML( Xml::closeElement( 'div' ) ); + $out->addWikiMsg( 'specialpage-empty' ); + $out->addHTML( Xml::closeElement( 'div' ) ); return; } } @@ -506,8 +520,8 @@ abstract class QueryPage extends SpecialPage { # The actual results; specialist subclasses will want to handle this # with more than a straight list, so we hand them the info, plus # an OutputPage, and let them get on with it - $this->outputResults( $wgOut, - $wgUser->getSkin(), + $this->outputResults( $out, + $this->getSkin(), $dbr, # Should use a ResultWrapper for this $res, $this->numRows, @@ -515,10 +529,10 @@ abstract class QueryPage extends SpecialPage { # Repeat the paging links at the bottom if ( $this->shownavigation ) { - $wgOut->addHTML( '

' . $paging . '

' ); + $out->addHTML( '

' . $paging . '

' ); } - $wgOut->addHTML( Xml::closeElement( 'div' ) ); + $out->addHTML( Xml::closeElement( 'div' ) ); return $this->numRows; } @@ -539,8 +553,9 @@ abstract class QueryPage extends SpecialPage { if ( $num > 0 ) { $html = array(); - if ( !$this->listoutput ) + if ( !$this->listoutput ) { $html[] = $this->openList( $offset ); + } # $res might contain the whole 1,000 rows, so we read up to # $num [should update this to use a Pager] @@ -570,8 +585,9 @@ abstract class QueryPage extends SpecialPage { } } - if ( !$this->listoutput ) + if ( !$this->listoutput ) { $html[] = $this->closeList(); + } $html = $this->listoutput ? $wgContLang->listToText( $html ) @@ -581,10 +597,17 @@ abstract class QueryPage extends SpecialPage { } } + /** + * @param $offset + * @return string + */ function openList( $offset ) { return "\n
    \n"; } + /** + * @return string + */ function closeList() { return "
\n"; } @@ -601,8 +624,7 @@ abstract class QueryPage extends SpecialPage { global $wgFeed, $wgFeedClasses; if ( !$wgFeed ) { - global $wgOut; - $wgOut->addWikiMsg( 'feed-unavailable' ); + $this->getOutput()->addWikiMsg( 'feed-unavailable' ); return; } @@ -618,7 +640,6 @@ abstract class QueryPage extends SpecialPage { $this->feedUrl() ); $feed->outHeader(); - $dbr = wfGetDB( DB_SLAVE ); $res = $this->reallyDoQuery( $limit, 0 ); foreach ( $res as $obj ) { $item = $this->feedResult( $obj ); @@ -673,18 +694,16 @@ abstract class QueryPage extends SpecialPage { function feedTitle() { global $wgLanguageCode, $wgSitename; - $page = SpecialPage::getPage( $this->getName() ); - $desc = $page->getDescription(); + $desc = $this->getDescription(); return "$wgSitename - $desc [$wgLanguageCode]"; } function feedDesc() { - return wfMsgExt( 'tagline', 'parsemag' ); + return $this->msg( 'tagline' )->text(); } function feedUrl() { - $title = SpecialPage::getTitleFor( $this->getName() ); - return $title->getFullURL(); + return $this->getTitle()->getFullURL(); } } @@ -741,8 +760,8 @@ abstract class WantedQueryPage extends QueryPage { if ( $title instanceof Title ) { if ( $this->isCached() || $this->forceExistenceCheck() ) { $pageLink = $title->isKnown() - ? '' . $skin->link( $title ) . '' - : $skin->link( + ? '' . Linker::link( $title ) . '' + : Linker::link( $title, null, array(), @@ -750,7 +769,7 @@ abstract class WantedQueryPage extends QueryPage { array( 'broken' ) ); } else { - $pageLink = $skin->link( + $pageLink = Linker::link( $title, null, array(), @@ -758,10 +777,9 @@ abstract class WantedQueryPage extends QueryPage { array( 'broken' ) ); } - return wfSpecialList( $pageLink, $this->makeWlhLink( $title, $skin, $result ) ); + return $this->getLanguage()->specialList( $pageLink, $this->makeWlhLink( $title, $result ) ); } else { - $tsafe = htmlspecialchars( $result->title ); - return wfMsgHtml( 'wantedpages-badtitle', $tsafe ); + return $this->msg( 'wantedpages-badtitle', $result->title )->escaped(); } } @@ -769,15 +787,12 @@ abstract class WantedQueryPage extends QueryPage { * Make a "what links here" link for a given title * * @param $title Title to make the link for - * @param $skin Skin object to use * @param $result Object: result row * @return string */ - private function makeWlhLink( $title, $skin, $result ) { - global $wgLang; - $wlh = SpecialPage::getTitleFor( 'Whatlinkshere' ); - $label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ), - $wgLang->formatNum( $result->value ) ); - return $skin->link( $wlh, $label, array(), array( 'target' => $title->getPrefixedText() ) ); + private function makeWlhLink( $title, $result ) { + $wlh = SpecialPage::getTitleFor( 'Whatlinkshere', $title->getPrefixedText() ); + $label = $this->msg( 'nlinks' )->numParams( $result->value )->escaped(); + return Linker::link( $wlh, $label ); } }