Add support for Number grouping(commafy) based on CLDR number grouping patterns like...

[lhc/web/wiklou.git] / includes / QueryPage.php

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 7edc7db..c5a093d 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -381,9 +381,9 @@ abstract class QueryPage extends SpecialPage {
        }
 
        /**
-        * 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 {
@@ -437,23 +437,23 @@ abstract class QueryPage extends SpecialPage {
         * 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();
+               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;
                }
 
@@ -470,21 +470,22 @@ abstract class QueryPage extends SpecialPage {
                                $ts = $this->getCachedTimestamp();
 
                                if ( $ts ) {
-                                       $updated = $wgLang->timeanddate( $ts, true, true );
-                                       $updateddate = $wgLang->date( $ts, true, true );
-                                       $updatedtime = $wgLang->time( $ts, true, true );
-                                       $wgOut->addMeta( 'Data-Cache-Time', $ts );
-                                       $wgOut->addInlineScript( "var dataCacheTime = '$ts';" );
-                                       $wgOut->addWikiMsg( 'perfcachedts', $updated, $updateddate, $updatedtime );
+                                       $lang = $this->getLang();
+                                       $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' );
                                }
 
                        }
@@ -495,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( '<p>' . wfShowingResults( $this->offset, $this->numRows ) . '</p>' );
+                               $out->addHTML( '<p>' . wfShowingResults( $this->offset, $this->numRows ) . '</p>' );
                                # 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( '<p>' . $paging . '</p>' );
+                               $out->addHTML( '<p>' . $paging . '</p>' );
                        } 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( '<p>' . wfMsgHtml( 'specialpage-empty' ) . '</p>' );
-                               $wgOut->addHTML( Xml::closeElement( 'div' ) );
+                               $out->addHTML( '<p>' . wfMsgHtml( 'specialpage-empty' ) . '</p>' );
+                               $out->addHTML( Xml::closeElement( 'div' ) );
                                return;
                        }
                }
@@ -519,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,
@@ -528,10 +529,10 @@ abstract class QueryPage extends SpecialPage {
 
                # Repeat the paging links at the bottom
                if ( $this->shownavigation ) {
-                       $wgOut->addHTML( '<p>' . $paging . '</p>' );
+                       $out->addHTML( '<p>' . $paging . '</p>' );
                }
 
-               $wgOut->addHTML( Xml::closeElement( 'div' ) );
+               $out->addHTML( Xml::closeElement( 'div' ) );
 
                return $this->numRows;
        }
@@ -552,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]
@@ -583,8 +585,9 @@ abstract class QueryPage extends SpecialPage {
                                }
                        }
 
-                       if ( !$this->listoutput )
+                       if ( !$this->listoutput ) {
                                $html[] = $this->closeList();
+                       }
 
                        $html = $this->listoutput
                                ? $wgContLang->listToText( $html )
@@ -614,8 +617,7 @@ abstract class QueryPage extends SpecialPage {
                global $wgFeed, $wgFeedClasses;
 
                if ( !$wgFeed ) {
-                       global $wgOut;
-                       $wgOut->addWikiMsg( 'feed-unavailable' );
+                       $this->getOutput()->addWikiMsg( 'feed-unavailable' );
                        return;
                }
 
@@ -631,7 +633,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 );
@@ -686,8 +687,7 @@ 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]";
        }
 
@@ -696,8 +696,7 @@ abstract class QueryPage extends SpecialPage {
        }
 
        function feedUrl() {
-               $title = SpecialPage::getTitleFor( $this->getName() );
-               return $title->getFullURL();
+               return $this->getTitle()->getFullURL();
        }
 }
 
@@ -787,10 +786,9 @@ abstract class WantedQueryPage extends QueryPage {
         * @return string
         */
        private function makeWlhLink( $title, $skin, $result ) {
-               global $wgLang;
                $wlh = SpecialPage::getTitleFor( 'Whatlinkshere' );
                $label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ),
-               $wgLang->formatNum( $result->value ) );
+               $this->getLang()->formatNum( $result->value ) );
                return $skin->link( $wlh, $label, array(), array( 'target' => $title->getPrefixedText() ) );
        }
 }