* Fix object variable used for displaying "not-patrolled" CSS class on list
[lhc/web/wiklou.git] / includes / QueryPage.php
index d386d12..27c6927 100644 (file)
@@ -19,7 +19,7 @@ $wgQueryPages = array(
        array( 'DeadendPagesPage',              'Deadendpages'                  ),
        array( 'DisambiguationsPage',           'Disambiguations'               ),
        array( 'DoubleRedirectsPage',           'DoubleRedirects'               ),
-       array( 'ListredirectsPage',             'Listredirects' ),
+       array( 'ListredirectsPage',             'Listredirects'                                 ),
        array( 'LonelyPagesPage',               'Lonelypages'                   ),
        array( 'LongPagesPage',                 'Longpages'                     ),
        array( 'MostcategoriesPage',            'Mostcategories'                ),
@@ -27,17 +27,19 @@ $wgQueryPages = array(
        array( 'MostlinkedCategoriesPage',      'Mostlinkedcategories'          ),
        array( 'MostlinkedPage',                'Mostlinked'                    ),
        array( 'MostrevisionsPage',             'Mostrevisions'                 ),
+       array( 'FewestrevisionsPage',           'Fewestrevisions'               ),
        array( 'NewPagesPage',                  'Newpages'                      ),
        array( 'ShortPagesPage',                'Shortpages'                    ),
        array( 'UncategorizedCategoriesPage',   'Uncategorizedcategories'       ),
        array( 'UncategorizedPagesPage',        'Uncategorizedpages'            ),
-       array( 'UncategorizedImagesPage',       'Uncategorizedimages' ),
+       array( 'UncategorizedImagesPage',       'Uncategorizedimages'                   ),
        array( 'UnusedCategoriesPage',          'Unusedcategories'              ),
        array( 'UnusedimagesPage',              'Unusedimages'                  ),
        array( 'WantedCategoriesPage',          'Wantedcategories'              ),
        array( 'WantedPagesPage',               'Wantedpages'                   ),
        array( 'UnwatchedPagesPage',            'Unwatchedpages'                ),
-       array( 'UnusedtemplatesPage',           'Unusedtemplates' ),
+       array( 'UnusedtemplatesPage',           'Unusedtemplates'                               ),
+       array( 'WithoutInterwikiPage',                  'Withoutinterwiki'                              ),
 );
 wfRunHooks( 'wgQueryPages', array( &$wgQueryPages ) );
 
@@ -306,7 +308,7 @@ class QueryPage {
                                        $updated = $wgLang->timeAndDate( $tRow->qci_timestamp, true, true );
                                        $cacheNotice = wfMsg( 'perfcachedts', $updated );
                                        $wgOut->addMeta( 'Data-Cache-Time', $tRow->qci_timestamp );
-                                       $wgOut->addScript( '<script language="JavaScript">var dataCacheTime = \'' . $tRow->qci_timestamp . '\';</script>' );
+                                       $wgOut->addInlineScript( "var dataCacheTime = '{$tRow->qci_timestamp}';" );
                                } else {
                                        $cacheNotice = wfMsg( 'perfcached' );
                                }
@@ -330,65 +332,99 @@ class QueryPage {
                $num = $dbr->numRows($res);
 
                $this->preprocessResults( $dbr, $res );
-
-               $sk = $wgUser->getSkin( );
-
-               if($shownavigation) {
-                       $wgOut->addHTML( $this->getPageHeader() );
-
-                       # if list is empty, show it
-                       if( $num == 0 ) {
-                               $wgOut->addHTML( '<p>' . wfMsgHTML('specialpage-empty') . '</p>' );
+               $sk = $wgUser->getSkin();
+               
+               # Top header and navigation
+               if( $shownavigation ) {
+                       $wgOut->addHtml( $this->getPageHeader() );
+                       if( $num > 0 ) {
+                               $wgOut->addHtml( '<p>' . wfShowingResults( $offset, $num ) . '</p>' );
+                               # Disable the "next" link when we reach the end
+                               $paging = wfViewPrevNext( $offset, $limit, $wgContLang->specialPage( $sname ),
+                                       wfArrayToCGI( $this->linkParameters() ), ( $num < $limit ) );
+                               $wgOut->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>' );
                                return;
                        }
-
-                       $top = wfShowingResults( $offset, $num);
-                       $wgOut->addHTML( "<p>{$top}\n" );
-
-                       # often disable 'next' link when we reach the end
-                       $atend = $num < $limit;
-
-                       $sl = wfViewPrevNext( $offset, $limit ,
-                               $wgContLang->specialPage( $sname ),
-                               wfArrayToCGI( $this->linkParameters() ), $atend );
-                       $wgOut->addHTML( "<br />{$sl}</p>\n" );
                }
-               if ( $num > 0 ) {
-                       $s = array();
-                       if ( ! $this->listoutput )
-                               $s[] = $this->openList( $offset );
-
-                       # Only read at most $num rows, because $res may contain the whole 1000
-                       for ( $i = 0; $i < $num && $obj = $dbr->fetchObject( $res ); $i++ ) {
-                               $format = $this->formatResult( $sk, $obj );
-                               if ( $format ) {
-                                       $attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
-                                                                               $obj->patrolled == 0 ) ? ' class="not-patrolled"' : '';
-                                       $s[] = $this->listoutput ? $format : "<li{$attr}>{$format}</li>\n";
+               
+               # 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(),
+                       $dbr, # Should use a ResultWrapper for this
+                       $res,
+                       $dbr->numRows( $res ),
+                       $offset );
+
+               # Repeat the paging links at the bottom
+               if( $shownavigation ) {
+                       $wgOut->addHtml( '<p>' . $paging . '</p>' );
+               }
+               
+               return $num;
+       }
+       
+       /**
+        * Format and output report results using the given information plus
+        * OutputPage
+        *
+        * @param OutputPage $out OutputPage to print to
+        * @param Skin $skin User skin to use
+        * @param Database $dbr Database (read) connection to use
+        * @param int $res Result pointer
+        * @param int $num Number of available result rows
+        * @param int $offset Paging offset
+        */
+       protected function outputResults( $out, $skin, $dbr, $res, $num, $offset ) {
+               global $wgContLang;
+       
+               if( $num > 0 ) {
+                       $html = array();
+                       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]
+                       for( $i = 0; $i < $num && $row = $dbr->fetchObject( $res ); $i++ ) {
+                               $line = $this->formatResult( $skin, $row );
+                               if( $line ) {
+                                       $attr = ( isset( $row->usepatrol ) && $row->usepatrol && $row->patrolled == 0 )
+                                               ? ' class="not-patrolled"'
+                                               : '';
+                                       $html[] = $this->listoutput
+                                               ? $format
+                                               : "<li{$attr}>{$line}</li>\n";
                                }
                        }
-
-                       if($this->tryLastResult()) {
-                               // flush the very last result
-                               $obj = null;
-                               $format = $this->formatResult( $sk, $obj );
-                               if( $format ) {
-                                       $attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
-                                                                               $obj->patrolled == 0 ) ? ' class="not-patrolled"' : '';
-                                       $s[] = "<li{$attr}>{$format}</li>\n";
+                       
+                       # Flush the final result
+                       if( $this->tryLastResult() ) {
+                               $row = null;
+                               $line = $this->formatResult( $skin, $row );
+                               if( $line ) {
+                                       $attr = ( isset( $row->usepatrol ) && $row->usepatrol && $row->patrolled == 0 )
+                                               ? ' class="not-patrolled"'
+                                               : '';
+                                       $html[] = $this->listoutput
+                                               ? $format
+                                               : "<li{$attr}>{$line}</li>\n";
                                }
                        }
-
-                       $dbr->freeResult( $res );
-                       if ( ! $this->listoutput )
-                               $s[] = $this->closeList();
-                       $str = $this->listoutput ? $wgContLang->listToText( $s ) : implode( '', $s );
-                       $wgOut->addHTML( $str );
-               }
-               if($shownavigation) {
-                       $wgOut->addHTML( "<p>{$sl}</p>\n" );
+                       
+                       if( !$this->listoutput )
+                               $html[] = $this->closeList();
+                       
+                       $html = $this->listoutput
+                               ? $wgContLang->listToText( $html )
+                               : implode( '', $html );
+                       
+                       $out->addHtml( $html );
                }
-               return $num;
        }
        
        function openList( $offset ) {
@@ -489,19 +525,4 @@ class QueryPage {
        }
 }
 
-/**
- * This is a subclass for very simple queries that are just looking for page
- * titles that match some criteria. It formats each result item as a link to
- * that page.
- *
- */
-class PageQueryPage extends QueryPage {
-
-       function formatResult( $skin, $result ) {
-               global $wgContLang;
-               $nt = Title::makeTitle( $result->namespace, $result->title );
-               return $skin->makeKnownLinkObj( $nt, htmlspecialchars( $wgContLang->convert( $nt->getPrefixedText() ) ) );
-       }
-}
-
-?>
+?>
\ No newline at end of file