Make SpecialAllpages and SpecialPrefixindex directly extend IncludableSpecialPage:
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sat, 23 Aug 2008 20:32:46 +0000 (20:32 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sat, 23 Aug 2008 20:32:46 +0000 (20:32 +0000)
* it is possible to have the title object by calling $this->getTitle() and not by having to redefine the special page name in that classes
* passing the $including param is no longer required, use $this->including() instead

includes/SpecialPage.php
includes/specials/SpecialAllpages.php
includes/specials/SpecialPrefixindex.php

index c7b0308..0ff8089 100644 (file)
@@ -121,8 +121,8 @@ class SpecialPage
                'Deadendpages'              => array( 'SpecialPage', 'Deadendpages' ),
                'Protectedpages'            => array( 'SpecialPage', 'Protectedpages' ),
                'Protectedtitles'           => array( 'SpecialPage', 'Protectedtitles' ),
-               'Allpages'                  => array( 'IncludableSpecialPage', 'Allpages' ),
-               'Prefixindex'               => array( 'IncludableSpecialPage', 'Prefixindex' ) ,
+               'Allpages'                  => 'SpecialAllpages',
+               'Prefixindex'               => 'SpecialPrefixindex',
                'Ipblocklist'               => array( 'SpecialPage', 'Ipblocklist' ),
                'Specialpages'              => array( 'UnlistedSpecialPage', 'Specialpages' ),
                'Contributions'             => array( 'SpecialPage', 'Contributions' ),
index 65209ee..9745b5f 100644 (file)
@@ -1,45 +1,11 @@
 <?php
-/**
- * @file
- * @ingroup SpecialPage
- */
-
-/**
- * Entry point : initialise variables and call subfunctions.
- * @param $par String: becomes "FOO" when called like Special:Allpages/FOO (default NULL)
- * @param $specialPage See the SpecialPage object.
- */
-function wfSpecialAllpages( $par=NULL, $specialPage ) {
-       global $wgRequest, $wgOut, $wgContLang;
-
-       # GET values
-       $from = $wgRequest->getVal( 'from', null );
-       $to = $wgRequest->getVal( 'to', null );
-       $namespace = $wgRequest->getInt( 'namespace' );
-
-       $namespaces = $wgContLang->getNamespaces();
-
-       $indexPage = new SpecialAllpages();
-
-       $wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) )  ?
-               wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
-               wfMsg( 'allarticles' )
-       );
-
-       if( isset($par) ) {
-               $indexPage->showChunk( $namespace, $par, $to, $specialPage->including() );
-       } elseif( isset($from) && !isset($to) ) {
-               $indexPage->showChunk( $namespace, $from, $to, $specialPage->including() );
-       } else {
-               $indexPage->showToplevel( $namespace, $from, $to, $specialPage->including() );
-       }
-}
 
 /**
  * Implements Special:Allpages
  * @ingroup SpecialPage
  */
-class SpecialAllpages {
+class SpecialAllpages extends IncludableSpecialPage {
+
        /**
         * Maximum number of pages to show on single subpage.
         */
@@ -56,394 +22,424 @@ class SpecialAllpages {
     protected $maxPageLength = 70;
 
        /**
-        * Name of this special page. Used to make title objects that reference back
-        * to this page.
+        * Determines, which message describes the input field 'nsfrom'.
         */
-       protected $name = 'Allpages';
+       protected $nsfromMsg = 'allpagesfrom';
+
+       function __construct( $name = 'Allpages' ){
+               parent::__construct( $name );   
+       }
 
        /**
-        * Determines, which message describes the input field 'nsfrom'.
+        * Entry point : initialise variables and call subfunctions.
+        * @param $par String: becomes "FOO" when called like Special:Allpages/FOO (default NULL)
+        * @param $specialPage See the SpecialPage object.
         */
-       protected $nsfromMsg = 'allpagesfrom';
+       function execute( $par ) {
+               global $wgRequest, $wgOut, $wgContLang;
 
-/**
- * HTML for the top form
- * @param integer $namespace A namespace constant (default NS_MAIN).
- * @param string $from dbKey we are starting listing at.
- * @param string $to dbKey we are ending listing at.
- */
-function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '' ) {
-    global $wgScript;
-    $t = SpecialPage::getTitleFor( $this->name );
-
-    $out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
-    $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-    $out .= Xml::hidden( 'title', $t->getPrefixedText() );
-    $out .= Xml::openElement( 'fieldset' );
-    $out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
-    $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
-    $out .= "<tr>
-            <td class='mw-label'>" .
-                Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
-            "</td>
-            <td class='mw-input'>" .
-                Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
-            "</td>
-        </tr>
-        <tr>
-            <td class='mw-label'>" .
-                Xml::label( wfMsg( 'allpagesto' ), 'nsto' ) .
-            "</td>
-            <td class='mw-input'>" .
-                Xml::input( 'to', 30, str_replace('_',' ',$to), array( 'id' => 'nsto' ) ) .
-            "</td>
-        </tr>
-        <tr>
-            <td class='mw-label'>" .
-                Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
-            "</td>
-            <td class='mw-input'>" .
-                Xml::namespaceSelector( $namespace, null ) . ' ' .
-                Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
-            "</td>
-            </tr>";
-    $out .= Xml::closeElement( 'table' );
-    $out .= Xml::closeElement( 'fieldset' );
-    $out .= Xml::closeElement( 'form' );
-    $out .= Xml::closeElement( 'div' );
-    return $out;
-}
+               $this->setHeaders();
+               $this->outputHeader();
 
-/**
- * @param integer $namespace (default NS_MAIN)
- */
-function showToplevel( $namespace = NS_MAIN, $from = '', $to = '', $including = false ) {
-       global $wgOut, $wgContLang;
-       $align = $wgContLang->isRtl() ? 'left' : 'right';
-
-       # TODO: Either make this *much* faster or cache the title index points
-       # in the querycache table.
-
-       $dbr = wfGetDB( DB_SLAVE );
-       $out = "";
-       $where = array( 'page_namespace' => $namespace );
-       
-       $from = Title::makeTitleSafe( $namespace, $from );
-       $to = Title::makeTitleSafe( $namespace, $to );
-       $from = ( $from && $from->isLocal() ) ? $from->getDBKey() : null;
-       $to = ( $to && $to->isLocal() ) ? $to->getDBKey() : null;
-       
-       if( isset($from) )
-               $where[] = 'page_title >= '.$dbr->addQuotes( $from );
-       if( isset($to) )
-               $where[] = 'page_title <= '.$dbr->addQuotes( $to );
-
-       global $wgMemc;
-       $key = wfMemcKey( 'allpages', 'ns', $namespace, $from, $to );
-       $lines = $wgMemc->get( $key );
-       
-       $count = $dbr->estimateRowCount( 'page', '*', $where, __METHOD__ );
-       $maxPerSubpage = intval($count/$this->maxLineCount);
-       $maxPerSubpage = max($maxPerSubpage,$this->maxPerPage);
-
-       if( !is_array( $lines ) ) {
-               $options = array( 'LIMIT' => 1 );
-               $options['ORDER BY'] = 'page_title ASC';
-               $firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options );
-               $lastTitle = $firstTitle;
-               # This array is going to hold the page_titles in order.
-               $lines = array( $firstTitle );
-               # If we are going to show n rows, we need n+1 queries to find the relevant titles.
-               $done = false;
-               while( !$done ) {
-                       // Fetch the last title of this chunk and the first of the next
-                       $chunk = is_null( $lastTitle )
-                               ? ''
-                               : 'page_title >= ' . $dbr->addQuotes( $lastTitle );
-                       $chunk = array($chunk);
-                       $res = $dbr->select( 'page', /* FROM */
-                               'page_title', /* WHAT */
-                               array_merge($where,$chunk),
-                               __METHOD__,
-                               array ('LIMIT' => 2, 'OFFSET' => $maxPerSubpage - 1, 'ORDER BY' => 'page_title ASC') 
-                       );
+               # GET values
+               $from = $wgRequest->getVal( 'from', null );
+               $to = $wgRequest->getVal( 'to', null );
+               $namespace = $wgRequest->getInt( 'namespace' );
 
-                       if( $s = $dbr->fetchObject( $res ) ) {
-                               array_push( $lines, $s->page_title );
-                       } else {
-                               // Final chunk, but ended prematurely. Go back and find the end.
-                               $endTitle = $dbr->selectField( 'page', 'MAX(page_title)',
-                                       array_merge($where,$chunk), 
-                                       __METHOD__ );
-                               array_push( $lines, $endTitle );
-                               $done = true;
+               $namespaces = $wgContLang->getNamespaces();
+
+               $wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) )  ?
+                       wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
+                       wfMsg( 'allarticles' )
+               );
+
+               if( isset($par) ) {
+                       $this->showChunk( $namespace, $par, $to );
+               } elseif( isset($from) && !isset($to) ) {
+                       $this->showChunk( $namespace, $from, $to );
+               } else {
+                       $this->showToplevel( $namespace, $from, $to );
+               }
+       }
+
+       /**
+        * HTML for the top form
+        * @param integer $namespace A namespace constant (default NS_MAIN).
+        * @param string $from dbKey we are starting listing at.
+        * @param string $to dbKey we are ending listing at.
+        */
+       function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '' ) {
+           global $wgScript;
+           $t = $this->getTitle();
+
+           $out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
+           $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+           $out .= Xml::hidden( 'title', $t->getPrefixedText() );
+           $out .= Xml::openElement( 'fieldset' );
+           $out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
+           $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
+           $out .= "<tr>
+                   <td class='mw-label'>" .
+                       Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
+                   "</td>
+                   <td class='mw-input'>" .
+                       Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
+                   "</td>
+               </tr>
+               <tr>
+                   <td class='mw-label'>" .
+                       Xml::label( wfMsg( 'allpagesto' ), 'nsto' ) .
+                   "</td>
+                   <td class='mw-input'>" .
+                       Xml::input( 'to', 30, str_replace('_',' ',$to), array( 'id' => 'nsto' ) ) .
+                   "</td>
+               </tr>
+               <tr>
+                   <td class='mw-label'>" .
+                       Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+                   "</td>
+                   <td class='mw-input'>" .
+                       Xml::namespaceSelector( $namespace, null ) . ' ' .
+                       Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
+                   "</td>
+                   </tr>";
+           $out .= Xml::closeElement( 'table' );
+           $out .= Xml::closeElement( 'fieldset' );
+           $out .= Xml::closeElement( 'form' );
+           $out .= Xml::closeElement( 'div' );
+           return $out;
+       }
+
+       /**
+        * @param integer $namespace (default NS_MAIN)
+        */
+       function showToplevel( $namespace = NS_MAIN, $from = '', $to = '' ) {
+               global $wgOut, $wgContLang;
+               $align = $wgContLang->isRtl() ? 'left' : 'right';
+
+               # TODO: Either make this *much* faster or cache the title index points
+               # in the querycache table.
+
+               $dbr = wfGetDB( DB_SLAVE );
+               $out = "";
+               $where = array( 'page_namespace' => $namespace );
+
+               $from = Title::makeTitleSafe( $namespace, $from );
+               $to = Title::makeTitleSafe( $namespace, $to );
+               $from = ( $from && $from->isLocal() ) ? $from->getDBKey() : null;
+               $to = ( $to && $to->isLocal() ) ? $to->getDBKey() : null;
+
+               if( isset($from) )
+                       $where[] = 'page_title >= '.$dbr->addQuotes( $from );
+               if( isset($to) )
+                       $where[] = 'page_title <= '.$dbr->addQuotes( $to );
+
+               global $wgMemc;
+               $key = wfMemcKey( 'allpages', 'ns', $namespace, $from, $to );
+               $lines = '';//$wgMemc->get( $key );
+
+               $count = $dbr->estimateRowCount( 'page', '*', $where, __METHOD__ );
+               $maxPerSubpage = intval($count/$this->maxLineCount);
+               $maxPerSubpage = max($maxPerSubpage,$this->maxPerPage);
+
+               if( !is_array( $lines ) ) {
+                       $options = array( 'LIMIT' => 1 );
+                       $options['ORDER BY'] = 'page_title ASC';
+                       $firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options );
+                       $lastTitle = $firstTitle;
+                       # This array is going to hold the page_titles in order.
+                       $lines = array( $firstTitle );
+                       # If we are going to show n rows, we need n+1 queries to find the relevant titles.
+                       $done = false;
+                       while( !$done ) {
+                               // Fetch the last title of this chunk and the first of the next
+                               $chunk = is_null( $lastTitle )
+                                       ? ''
+                                       : 'page_title >= ' . $dbr->addQuotes( $lastTitle );
+                               $chunk = array($chunk);
+                               $res = $dbr->select( 'page', /* FROM */
+                                       'page_title', /* WHAT */
+                                       array_merge($where,$chunk),
+                                       __METHOD__,
+                                       array ('LIMIT' => 2, 'OFFSET' => $maxPerSubpage - 1, 'ORDER BY' => 'page_title ASC')
+                               );
+
+                               if( $s = $dbr->fetchObject( $res ) ) {
+                                       array_push( $lines, $s->page_title );
+                               } else {
+                                       // Final chunk, but ended prematurely. Go back and find the end.
+                                       $endTitle = $dbr->selectField( 'page', 'MAX(page_title)',
+                                               array_merge($where,$chunk),
+                                               __METHOD__ );
+                                       array_push( $lines, $endTitle );
+                                       $done = true;
+                               }
+                               if( $s = $res->fetchObject() ) {
+                                       array_push( $lines, $s->page_title );
+                                       $lastTitle = $s->page_title;
+                               } else {
+                                       // This was a final chunk and ended exactly at the limit.
+                                       // Rare but convenient!
+                                       $done = true;
+                               }
+                               $res->free();
                        }
-                       if( $s = $dbr->fetchObject( $res ) ) {
-                               array_push( $lines, $s->page_title );
-                               $lastTitle = $s->page_title;
+                       $wgMemc->add( $key, $lines, 3600 );
+               }
+
+               // If there are only two or less sections, don't even display them.
+               // Instead, display the first section directly.
+               if( count( $lines ) <= 2 ) {
+                       if( !empty($lines) ) {
+                               $this->showChunk( $namespace, $lines[0], $lines[count($lines)-1] );
                        } else {
-                               // This was a final chunk and ended exactly at the limit.
-                               // Rare but convenient!
-                               $done = true;
+                               $wgOut->addHtml( $this->namespaceForm( $namespace, $from, $to ) );
                        }
-                       $dbr->freeResult( $res );
+                       return;
                }
-               $wgMemc->add( $key, $lines, 3600 );
-       }
 
-       // If there are only two or less sections, don't even display them.
-       // Instead, display the first section directly.
-       if( count( $lines ) <= 2 ) {
-               if( !empty($lines) ) {
-                       $this->showChunk( $namespace, $lines[0], $lines[count($lines)-1], $including );
-               } else {
-                       $wgOut->addHtml( $this->namespaceForm( $namespace, $from, $to ) );
+               # At this point, $lines should contain an even number of elements.
+               $out .= "<table class='allpageslist' style='background: inherit;'>";
+               while( count ( $lines ) > 0 ) {
+                       $inpoint = array_shift( $lines );
+                       $outpoint = array_shift( $lines );
+                       $out .= $this->showline( $inpoint, $outpoint, $namespace );
                }
-               return;
-       }
+               $out .= '</table>';
+               $nsForm = $this->namespaceForm( $namespace, $from, $to );
 
-       # At this point, $lines should contain an even number of elements.
-       $out .= "<table class='allpageslist' style='background: inherit;'>";
-       while( count ( $lines ) > 0 ) {
-               $inpoint = array_shift( $lines );
-               $outpoint = array_shift( $lines );
-               $out .= $this->showline( $inpoint, $outpoint, $namespace );
-       }
-       $out .= '</table>';
-       $nsForm = $this->namespaceForm( $namespace, $from, $to );
-
-       # Is there more?
-       if( $including ) {
-               $out2 = '';
-       } else {
-               if( isset($from) || isset($to) ) {
-                       global $wgUser;
-                       $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
-                       $out2 .= '<tr valign="top"><td>' . $nsForm;
-                       $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
-                               $wgUser->getSkin()->makeKnownLink( $wgContLang->specialPage( "Allpages" ), wfMsgHtml ( 'allpages' ) );
-                       $out2 .= "</td></tr></table><hr />";
+               # Is there more?
+               if( $this->including() ) {
+                       $out2 = '';
                } else {
-                       $out2 = $nsForm . '<hr />';
+                       if( isset($from) || isset($to) ) {
+                               global $wgUser;
+                               $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
+                               $out2 .= '<tr valign="top"><td>' . $nsForm;
+                               $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
+                                       $wgUser->getSkin()->makeKnownLinkObj( $this->getTitle(), wfMsgHtml ( 'allpages' ) );
+                               $out2 .= "</td></tr></table><hr />";
+                       } else {
+                               $out2 = $nsForm . '<hr />';
+                       }
                }
+               $wgOut->addHtml( $out2 . $out );
        }
-       $wgOut->addHtml( $out2 . $out );
-}
 
-/**
- * @todo Document
- * @param string $from
- * @param integer $namespace (Default NS_MAIN)
- */
-function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
-       global $wgContLang;
-       $align = $wgContLang->isRtl() ? 'left' : 'right';
-       $inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) );
-       $outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint ) );
-       // Don't let the length runaway
-       $inpointf = $wgContLang->truncate( $inpointf, $this->maxPageLength, '...' );
-       $outpointf = $wgContLang->truncate( $outpointf, $this->maxPageLength, '...' );
-
-       $queryparams = $namespace ? "namespace=$namespace&" : '';
-       $special = SpecialPage::getTitleFor( $this->name );
-       $link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) );
-
-       $out = wfMsgHtml( 'alphaindexline',
-               "<a href=\"$link\">$inpointf</a></td><td>",
-               "</td><td><a href=\"$link\">$outpointf</a>"
-       );
-       return '<tr><td align="' . $align . '">'.$out.'</td></tr>';
-}
+       /**
       * @todo Document
       * @param string $from
       * @param integer $namespace (Default NS_MAIN)
       */
+       function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
+               global $wgContLang;
+               $align = $wgContLang->isRtl() ? 'left' : 'right';
+               $inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) );
+               $outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint ) );
+               // Don't let the length runaway
+               $inpointf = $wgContLang->truncate( $inpointf, $this->maxPageLength, '...' );
+               $outpointf = $wgContLang->truncate( $outpointf, $this->maxPageLength, '...' );
+
+               $queryparams = $namespace ? "namespace=$namespace&" : '';
+               $special = $this->getTitle();
+               $link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) );
+
+               $out = wfMsgHtml( 'alphaindexline',
+                       "<a href=\"$link\">$inpointf</a></td><td>",
+                       "</td><td><a href=\"$link\">$outpointf</a>"
+               );
+               return '<tr><td align="' . $align . '">'.$out.'</td></tr>';
+       }
 
-/**
- * @param integer $namespace (Default NS_MAIN)
- * @param string $from list all pages from this name (default FALSE)
- * @param string $to list all pages to this name (default FALSE)
- */
-function showChunk( $namespace = NS_MAIN, $from = false, $to = false, $including = false ) {
-       global $wgOut, $wgUser, $wgContLang;
+       /**
       * @param integer $namespace (Default NS_MAIN)
       * @param string $from list all pages from this name (default FALSE)
       * @param string $to list all pages to this name (default FALSE)
       */
+       function showChunk( $namespace = NS_MAIN, $from = false, $to = false ) {
+               global $wgOut, $wgUser, $wgContLang;
 
-       $sk = $wgUser->getSkin();
+               $sk = $wgUser->getSkin();
 
-       $fromList = $this->getNamespaceKeyAndText($namespace, $from);
-       $toList = $this->getNamespaceKeyAndText( $namespace, $to );
-       $namespaces = $wgContLang->getNamespaces();
-       $align = $wgContLang->isRtl() ? 'left' : 'right';
+               $fromList = $this->getNamespaceKeyAndText($namespace, $from);
+               $toList = $this->getNamespaceKeyAndText( $namespace, $to );
+               $namespaces = $wgContLang->getNamespaces();
+               $align = $wgContLang->isRtl() ? 'left' : 'right';
 
-       $n = 0;
+               $n = 0;
 
-       if ( !$fromList || !$toList ) {
-               $out = wfMsgWikiHtml( 'allpagesbadtitle' );
-       } elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) {
-               // Show errormessage and reset to NS_MAIN
-               $out = wfMsgExt( 'allpages-bad-ns', array( 'parseinline' ), $namespace );
-               $namespace = NS_MAIN;
-       } else {
-               list( $namespace, $fromKey, $from ) = $fromList;
-               list( $namespace, $toKey, $to ) = $toList;
+               if ( !$fromList || !$toList ) {
+                       $out = wfMsgWikiHtml( 'allpagesbadtitle' );
+               } elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) {
+                       // Show errormessage and reset to NS_MAIN
+                       $out = wfMsgExt( 'allpages-bad-ns', array( 'parseinline' ), $namespace );
+                       $namespace = NS_MAIN;
+               } else {
+                       list( $namespace, $fromKey, $from ) = $fromList;
+                       list( $namespace, $toKey, $to ) = $toList;
 
-               $dbr = wfGetDB( DB_SLAVE );
-               $conds = array( 
-                       'page_namespace' => $namespace, 
-                       'page_title >= ' . $dbr->addQuotes( $fromKey )
-               );
-               if( $toKey !== "" ) {
-                       $conds[] = 'page_title <= ' . $dbr->addQuotes( $toKey );
-               }
+                       $dbr = wfGetDB( DB_SLAVE );
+                       $conds = array(
+                               'page_namespace' => $namespace,
+                               'page_title >= ' . $dbr->addQuotes( $fromKey )
+                       );
+                       if( $toKey !== "" ) {
+                               $conds[] = 'page_title <= ' . $dbr->addQuotes( $toKey );
+                       }
 
-               $res = $dbr->select( 'page',
-                       array( 'page_namespace', 'page_title', 'page_is_redirect' ),
-                       $conds,
-                       __METHOD__,
-                       array(
-                               'ORDER BY'  => 'page_title',
-                               'LIMIT'     => $this->maxPerPage + 1,
-                               'USE INDEX' => 'name_title',
-                       )
-               );
+                       $res = $dbr->select( 'page',
+                               array( 'page_namespace', 'page_title', 'page_is_redirect' ),
+                               $conds,
+                               __METHOD__,
+                               array(
+                                       'ORDER BY'  => 'page_title',
+                                       'LIMIT'     => $this->maxPerPage + 1,
+                                       'USE INDEX' => 'name_title',
+                               )
+                       );
 
-               if( $res->numRows() > 0 ) {
-                       $out = '<table style="background: inherit;" border="0" width="100%">';
-       
-                       while( ($n < $this->maxPerPage) && ($s = $dbr->fetchObject( $res )) ) {
-                               $t = Title::makeTitle( $s->page_namespace, $s->page_title );
-                               if( $t ) {
-                                       $link = ($s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
-                                               $sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) .
-                                               ($s->page_is_redirect ? '</div>' : '' );
-                               } else {
-                                       $link = '[[' . htmlspecialchars( $s->page_title ) . ']]';
-                               }
-                               if( $n % 3 == 0 ) {
-                                       $out .= '<tr>';
+                       if( $res->numRows() > 0 ) {
+                               $out = '<table style="background: inherit;" border="0" width="100%">';
+
+                               while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
+                                       $t = Title::makeTitle( $s->page_namespace, $s->page_title );
+                                       if( $t ) {
+                                               $link = ( $s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
+                                                       $sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) .
+                                                       ($s->page_is_redirect ? '</div>' : '' );
+                                       } else {
+                                               $link = '[[' . htmlspecialchars( $s->page_title ) . ']]';
+                                       }
+                                       if( $n % 3 == 0 ) {
+                                               $out .= '<tr>';
+                                       }
+                                       $out .= "<td width=\"33%\">$link</td>";
+                                       $n++;
+                                       if( $n % 3 == 0 ) {
+                                               $out .= '</tr>';
+                                       }
                                }
-                               $out .= "<td width=\"33%\">$link</td>";
-                               $n++;
-                               if( $n % 3 == 0 ) {
+                               if( ($n % 3) != 0 ) {
                                        $out .= '</tr>';
                                }
+                               $out .= '</table>';
+                       } else {
+                               $out = '';
                        }
-                       if( ($n % 3) != 0 ) {
-                               $out .= '</tr>';
-                       }
-                       $out .= '</table>';
-               } else {
-                       $out = '';
                }
-       }
 
-       if ( $including ) {
-               $out2 = '';
-       } else {
-               if( $from == '' ) {
-                       // First chunk; no previous link.
-                       $prevTitle = null;
+               if ( $this->including() ) {
+                       $out2 = '';
                } else {
-                       # Get the last title from previous chunk
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $res_prev = $dbr->select(
-                               'page',
-                               'page_title',
-                               array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ),
-                               __METHOD__,
-                               array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) )
-                       );
-
-                       # Get first title of previous complete chunk
-                       if( $dbr->numrows( $res_prev ) >= $this->maxPerPage ) {
-                               $pt = $dbr->fetchObject( $res_prev );
-                               $prevTitle = Title::makeTitle( $namespace, $pt->page_title );
+                       if( $from == '' ) {
+                               // First chunk; no previous link.
+                               $prevTitle = null;
                        } else {
-                               # The previous chunk is not complete, need to link to the very first title
-                               # available in the database
-                               $options = array( 'LIMIT' => 1 );
-                               if ( ! $dbr->implicitOrderby() ) {
-                                       $options['ORDER BY'] = 'page_title';
-                               }
-                               $reallyFirstPage_title = $dbr->selectField( 'page', 'page_title', 
-                                       array( 'page_namespace' => $namespace ), __METHOD__, $options );
-                               # Show the previous link if it s not the current requested chunk
-                               if( $from != $reallyFirstPage_title ) {
-                                       $prevTitle =  Title::makeTitle( $namespace, $reallyFirstPage_title );
+                               # Get the last title from previous chunk
+                               $dbr = wfGetDB( DB_SLAVE );
+                               $res_prev = $dbr->select(
+                                       'page',
+                                       'page_title',
+                                       array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ),
+                                       __METHOD__,
+                                       array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) )
+                               );
+
+                               # Get first title of previous complete chunk
+                               if( $dbr->numrows( $res_prev ) >= $this->maxPerPage ) {
+                                       $pt = $dbr->fetchObject( $res_prev );
+                                       $prevTitle = Title::makeTitle( $namespace, $pt->page_title );
                                } else {
-                                       $prevTitle = null;
+                                       # The previous chunk is not complete, need to link to the very first title
+                                       # available in the database
+                                       $options = array( 'LIMIT' => 1 );
+                                       if ( ! $dbr->implicitOrderby() ) {
+                                               $options['ORDER BY'] = 'page_title';
+                                       }
+                                       $reallyFirstPage_title = $dbr->selectField( 'page', 'page_title',
+                                               array( 'page_namespace' => $namespace ), __METHOD__, $options );
+                                       # Show the previous link if it s not the current requested chunk
+                                       if( $from != $reallyFirstPage_title ) {
+                                               $prevTitle =  Title::makeTitle( $namespace, $reallyFirstPage_title );
+                                       } else {
+                                               $prevTitle = null;
+                                       }
                                }
                        }
-               }
 
-               $nsForm = $this->namespaceForm( $namespace, $from, $to );
-               $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
-               $out2 .= '<tr valign="top"><td>' . $nsForm;
-               $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
-                               $sk->makeKnownLink( $wgContLang->specialPage( "Allpages" ),
-                                       wfMsgHtml ( 'allpages' ) );
-
-               $self = SpecialPage::getTitleFor( 'Allpages' );
-
-               # Do we put a previous link ?
-               if( isset( $prevTitle ) &&  $pt = $prevTitle->getText() ) {
-                       $q = 'from=' . $prevTitle->getPartialUrl()
-                               . ( $namespace ? '&namespace=' . $namespace : '' );
-                       $prevLink = $sk->makeKnownLinkObj( $self,
-                               wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q );
-                       $out2 .= ' | ' . $prevLink;
-               }
+                       $self = $this->getTitle();
 
-               if( $n == $this->maxPerPage && $s = $dbr->fetchObject($res) ) {
-                       # $s is the first link of the next chunk
-                       $t = Title::MakeTitle($namespace, $s->page_title);
-                       $q = 'from=' . $t->getPartialUrl()
-                               . ( $namespace ? '&namespace=' . $namespace : '' );
-                       $nextLink = $sk->makeKnownLinkObj( $self,
-                               wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q );
-                       $out2 .= ' | ' . $nextLink;
-               }
-               $out2 .= "</td></tr></table><hr />";
-       }
+                       $nsForm = $this->namespaceForm( $namespace, $from, $to );
+                       $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
+                       $out2 .= '<tr valign="top"><td>' . $nsForm;
+                       $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
+                                       $sk->makeKnownLinkObj( $self,
+                                               wfMsgHtml ( 'allpages' ) );
+
+                       # Do we put a previous link ?
+                       if( isset( $prevTitle ) &&  $pt = $prevTitle->getText() ) {
+                               $q = 'from=' . $prevTitle->getPartialUrl()
+                                       . ( $namespace ? '&namespace=' . $namespace : '' );
+                               $prevLink = $sk->makeKnownLinkObj( $self,
+                                       wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q );
+                               $out2 .= ' | ' . $prevLink;
+                       }
 
-       $wgOut->addHtml( $out2 . $out );
-       if( isset($prevLink) or isset($nextLink) ) {
-               $wgOut->addHtml( '<hr /><p style="font-size: smaller; float: ' . $align . '">' );
-               if( isset( $prevLink ) ) {
-                       $wgOut->addHTML( $prevLink );
-               }
-               if( isset( $prevLink ) && isset( $nextLink ) ) {
-                       $wgOut->addHTML( ' | ' );
-               }
-               if( isset( $nextLink ) ) {
-                       $wgOut->addHTML( $nextLink );
+                       if( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
+                               # $s is the first link of the next chunk
+                               $t = Title::MakeTitle($namespace, $s->page_title);
+                               $q = 'from=' . $t->getPartialUrl()
+                                       . ( $namespace ? '&namespace=' . $namespace : '' );
+                               $nextLink = $sk->makeKnownLinkObj( $self,
+                                       wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q );
+                               $out2 .= ' | ' . $nextLink;
+                       }
+                       $out2 .= "</td></tr></table><hr />";
                }
-               $wgOut->addHTML( '</p>' );
 
-       }
+               $wgOut->addHtml( $out2 . $out );
+               if( isset($prevLink) or isset($nextLink) ) {
+                       $wgOut->addHtml( '<hr /><p style="font-size: smaller; float: ' . $align . '">' );
+                       if( isset( $prevLink ) ) {
+                               $wgOut->addHTML( $prevLink );
+                       }
+                       if( isset( $prevLink ) && isset( $nextLink ) ) {
+                               $wgOut->addHTML( ' | ' );
+                       }
+                       if( isset( $nextLink ) ) {
+                               $wgOut->addHTML( $nextLink );
+                       }
+                       $wgOut->addHTML( '</p>' );
 
-}
+               }
 
-/**
- * @param int $ns the namespace of the article
- * @param string $text the name of the article
- * @return array( int namespace, string dbkey, string pagename ) or NULL on error
- * @static (sort of)
- * @access private
- */
-function getNamespaceKeyAndText ($ns, $text) {
-       if ( $text == '' )
-               return array( $ns, '', '' ); # shortcut for common case
-
-       $t = Title::makeTitleSafe($ns, $text);
-       if ( $t && $t->isLocal() ) {
-               return array( $t->getNamespace(), $t->getDBkey(), $t->getText() );
-       } else if ( $t ) {
-               return NULL;
        }
 
-       # try again, in case the problem was an empty pagename
-       $text = preg_replace('/(#|$)/', 'X$1', $text);
-       $t = Title::makeTitleSafe($ns, $text);
-       if ( $t && $t->isLocal() ) {
-               return array( $t->getNamespace(), '', '' );
-       } else {
-               return NULL;
+       /**
+        * @param int $ns the namespace of the article
+        * @param string $text the name of the article
+        * @return array( int namespace, string dbkey, string pagename ) or NULL on error
+        * @static (sort of)
+        * @access private
+        */
+       function getNamespaceKeyAndText($ns, $text) {
+               if ( $text == '' )
+                       return array( $ns, '', '' ); # shortcut for common case
+
+               $t = Title::makeTitleSafe($ns, $text);
+               if ( $t && $t->isLocal() ) {
+                       return array( $t->getNamespace(), $t->getDBkey(), $t->getText() );
+               } else if ( $t ) {
+                       return NULL;
+               }
+
+               # try again, in case the problem was an empty pagename
+               $text = preg_replace('/(#|$)/', 'X$1', $text);
+               $t = Title::makeTitleSafe($ns, $text);
+               if ( $t && $t->isLocal() ) {
+                       return array( $t->getNamespace(), '', '' );
+               } else {
+                       return NULL;
+               }
        }
 }
-}
index 49dc6c7..a360d50 100644 (file)
@@ -1,40 +1,4 @@
 <?php
-/**
- * @file
- * @ingroup SpecialPage
- */
-
-/**
- * Entry point : initialise variables and call subfunctions.
- * @param $par String: becomes "FOO" when called like Special:Prefixindex/FOO (default NULL)
- * @param $specialPage SpecialPage object.
- */
-function wfSpecialPrefixIndex( $par=NULL, $specialPage ) {
-       global $wgRequest, $wgOut, $wgContLang;
-
-       # GET values
-       $from = $wgRequest->getVal( 'from' );
-       $prefix = $wgRequest->getVal( 'prefix' );
-       $namespace = $wgRequest->getInt( 'namespace' );
-       $namespaces = $wgContLang->getNamespaces();
-
-       $indexPage = new SpecialPrefixIndex();
-
-       $wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces ) ) )
-               ? wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) )
-               : wfMsg( 'allarticles' )
-       );
-
-       if ( isset($par) ) {
-               $indexPage->showPrefixChunk( $namespace, $par, $specialPage->including(), $from );
-       } elseif ( isset($prefix) ) {
-               $indexPage->showPrefixChunk( $namespace, $prefix, $specialPage->including(), $from );
-       } elseif ( isset($from) ) {
-               $indexPage->showPrefixChunk( $namespace, $from, $specialPage->including(), $from );
-       } else {
-               $wgOut->addHtml( $indexPage->namespacePrefixForm( $namespace, null ) );
-       }
-}
 
 /**
  * implements Special:Prefixindex
@@ -44,9 +8,44 @@ class SpecialPrefixindex extends SpecialAllpages {
        // Inherit $maxPerPage
 
        // Define other properties
-       protected $name = 'Prefixindex';
        protected $nsfromMsg = 'allpagesprefix';
        
+       function __construct(){
+               parent::__construct( 'Prefixindex' );   
+       }
+       
+       /**
+        * Entry point : initialise variables and call subfunctions.
+        * @param $par String: becomes "FOO" when called like Special:Prefixindex/FOO (default null)
+        */
+       function execute( $par ) {
+               global $wgRequest, $wgOut, $wgContLang;
+
+               $this->setHeaders();
+               $this->outputHeader();
+
+               # GET values
+               $from = $wgRequest->getVal( 'from' );
+               $prefix = $wgRequest->getVal( 'prefix' );
+               $namespace = $wgRequest->getInt( 'namespace' );
+               $namespaces = $wgContLang->getNamespaces();
+
+               $wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces ) ) )
+                       ? wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) )
+                       : wfMsg( 'allarticles' )
+               );
+
+               if( isset( $par ) ){
+                       $this->showPrefixChunk( $namespace, $par, $from );
+               } elseif( isset( $prefix ) ){
+                       $this->showPrefixChunk( $namespace, $prefix, $from );
+               } elseif( isset( $from ) ){
+                       $this->showPrefixChunk( $namespace, $from, $from );
+               } else {
+                       $wgOut->addHtml( $this->namespacePrefixForm( $namespace, null ) );
+               }
+       }
+       
        /**
        * HTML for the top form
        * @param integer $namespace A namespace constant (default NS_MAIN).
@@ -54,7 +53,7 @@ class SpecialPrefixindex extends SpecialAllpages {
        */
        function namespacePrefixForm( $namespace = NS_MAIN, $from = '' ) {
                global $wgScript;
-               $t = SpecialPage::getTitleFor( $this->name );
+               $t = $this->getTitle();
 
                $out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
                $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
@@ -90,11 +89,9 @@ class SpecialPrefixindex extends SpecialAllpages {
         * @param integer $namespace (Default NS_MAIN)
         * @param string $from list all pages from this name (default FALSE)
         */
-       function showPrefixChunk( $namespace = NS_MAIN, $prefix, $including = false, $from = null ) {
+       function showPrefixChunk( $namespace = NS_MAIN, $prefix, $from = null ) {
                global $wgOut, $wgUser, $wgContLang;
 
-               $fname = 'indexShowChunk';
-
                $sk = $wgUser->getSkin();
 
                if (!isset($from)) $from = $prefix;
@@ -125,7 +122,7 @@ class SpecialPrefixindex extends SpecialAllpages {
                                        'page_title LIKE \'' . $dbr->escapeLike( $prefixKey ) .'%\'',
                                        'page_title >= ' . $dbr->addQuotes( $fromKey ),
                                ),
-                               $fname,
+                               __METHOD__,
                                array(
                                        'ORDER BY'  => 'page_title',
                                        'LIMIT'     => $this->maxPerPage + 1,
@@ -139,7 +136,7 @@ class SpecialPrefixindex extends SpecialAllpages {
                        if( $res->numRows() > 0 ) {
                                $out = '<table style="background: inherit;" border="0" width="100%">';
        
-                               while( ($n < $this->maxPerPage) && ($s = $dbr->fetchObject( $res )) ) {
+                               while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
                                        $t = Title::makeTitle( $s->page_namespace, $s->page_title );
                                        if( $t ) {
                                                $link = ($s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
@@ -166,22 +163,23 @@ class SpecialPrefixindex extends SpecialAllpages {
                        }
                }
 
-               if ( $including ) {
+               if ( $this->including() ) {
                        $out2 = '';
                } else {
                        $nsForm = $this->namespacePrefixForm( $namespace, $prefix );
+                       $self = $this->getTitle();
                        $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
                        $out2 .= '<tr valign="top"><td>' . $nsForm;
                        $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
-                                       $sk->makeKnownLink( $wgContLang->specialPage( $this->name ),
+                                       $sk->makeKnownLinkObj( $self,
                                                wfMsg ( 'allpages' ) );
-                       if ( isset($dbr) && $dbr && ($n == $this->maxPerPage) && ($s = $dbr->fetchObject( $res )) ) {
+                       if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
                                $namespaceparam = $namespace ? "&namespace=$namespace" : "";
-                               $out2 .= " | " . $sk->makeKnownLink(
-                                       $wgContLang->specialPage( $this->name ),
+                               $out2 .= " | " . $sk->makeKnownLinkObj(
+                                       $self,
                                        wfMsgHtml( 'nextpage', htmlspecialchars( $s->page_title ) ),
-                                       "from=" . wfUrlEncode ( $s->page_title ) .
-                                       "&prefix=" . wfUrlEncode ( $prefix ) . $namespaceparam );
+                                       "from=" . wfUrlEncode( $s->page_title ) .
+                                       "&prefix=" . wfUrlEncode( $prefix ) . $namespaceparam );
                        }
                        $out2 .= "</td></tr></table><hr />";
                }