A major reworking of [[Special:Allmessages]].

So far, the index page has generated 1020 (one thousand and twenty!) SQL
queries. Let's limit this to a maximum of 51. This means that the user is
presented with only 50 rows at a time; however, I have provided "previous" and
"next" links so they can navigate through it.  Additionally, the user can now
enter a "from" term in a text box rather than having to fiddle with the URL.

Furthermore, the user can now choose a namespace using a drop down box.  This
works both on the index page and on a "chunk" page.

Lastly, I think I have made the code for the index page more readable -- not
only by adding comments.

HINT: since this is such a major reworking, the patch is pretty useless.  It is
probably better for anyone interested to view the new file.

diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php
index 177df31..e4b7bba 100644 (file)
--- a/includes/SpecialAllpages.php
+++ b/includes/SpecialAllpages.php
@@ -2,25 +2,58 @@
 
 function wfSpecialAllpages( $par=NULL )
 {
-       global $indexMaxperpage, $wgRequest;
+       global $indexMaxperpage, $toplevelMaxperpage, $wgRequest, $wgOut, $wgLang;
        $indexMaxperpage = 480;
+       $toplevelMaxperpage = 50;
        $from = $wgRequest->getVal( 'from' );
        $namespace = $wgRequest->getVal( 'namespace' );
        if ( is_null($namespace) ) { $namespace = 0; }
+       $arr = $wgLang->getNamespaces();
+       $wgOut->setPagetitle ( $namespace > 0 ? wfMsg ( 'allpagesnamespace', $arr[$namespace] )
+                                             : wfMsg ( 'allarticles' ) );
 
-       if( $par ) {
+       if ( $par ) {
                indexShowChunk( $par, $namespace );
-       } elseif( !is_null( $from ) ) {
+       } elseif ( $from ) {
                indexShowChunk( $from, $namespace );
        } else {
-               indexShowToplevel();
+               indexShowToplevel ( $namespace );
        }
 }
 
-function indexShowToplevel()
+function namespaceForm ( $namespace = 0, $from = "" )
 {
-       global $wgOut, $indexMaxperpage, $wgLang;
+       global $wgLang, $wgScript;
+
+       $t = Title::makeTitle( NS_SPECIAL, "Allpages" );
+
+       $namespaceselect = '<select name="namespace">';
+       $arr = $wgLang->getNamespaces();
+       for ( $i = 0; $i < 14; $i++ ) {
+               $namespacename = str_replace ( "_", " ", $arr[$i] );
+               $n = ($i == 0) ? wfMsg ( 'articlenamespace' ) : $namespacename;
+               $sel = ($i == $namespace) ? ' selected="selected"' : '';
+               $namespaceselect .= "<option value='{$i}'{$sel}>{$n}</option>";
+       }
+       $namespaceselect .= '</select>';
+
+       $frombox = '<input type="text" size="20" name="from" value="'
+                   . htmlspecialchars ( $from ) . '"/>';
+       $submitbutton = '<input type="submit" value="' . wfMsg( 'go' ) . '" />';
+
+       $out = "<div class='namespaceselector'><form method='get' action='{$wgScript}'>";
+       $out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
+       $out .= wfMsg ( 'allpagesformtext', $frombox, $namespaceselect, $submitbutton );
+       $out .= '</form></div>';
+       return $out;
+}
+
+function indexShowToplevel ( $namespace = 0 )
+{
+       global $wgOut, $indexMaxperpage, $toplevelMaxperpage, $wgLang, $wgRequest, $wgUser;
+       $sk = $wgUser->getSkin();
        $fname = "indexShowToplevel";
+       $namespace = intval ($namespace);
 
        # Cache
        $vsp = $wgLang->getValidSpecialPages();
@@ -35,62 +68,109 @@ function indexShowToplevel()
 
        $dbr =& wfGetDB( DB_SLAVE );
        $cur = $dbr->tableName( 'cur' );
-       $fromwhere = "FROM $cur WHERE cur_namespace=0";
-       $order = 'ORDER BY cur_title';
+       $fromwhere = "FROM $cur WHERE cur_namespace=$namespace";
+       $order_arr = array ( 'ORDER BY' => 'cur_title' );
+       $order_str = 'ORDER BY cur_title';
        $out = "";
-       $where = array( 'cur_namespace' => 0 );
+       $where = array( 'cur_namespace' => $namespace );
 
        $count = $dbr->selectField( 'cur', 'COUNT(*)', $where, $fname );
        $sections = ceil( $count / $indexMaxperpage );
-       $inpoint = $dbr->selectField( 'cur', 'cur_title', $where, $fname, $order );
 
-       $out .= "<table>\n";
-       # There's got to be a cleaner way to do this!
-       for( $i = 1; $i < $sections; $i++ ) {
-               $from = $i * $indexMaxperpage;
-               $sql = "SELECT cur_title $fromwhere $order ".$dbr->limitResult(2,$from);
+       # We want to display $toplevelMaxperpage lines starting at $offset.
+       # NOTICE: $offset starts at 0
+       $offset = intval ( $wgRequest->getVal( 'offset' ) );
+       if ( $offset < 0 ) { $offset = 0; }
+       if ( $offset >= $sections ) { $offset = $sections - 1; }
+
+       # Where to stop? Notice that this can take the value of $sections, but $offset can't, because if
+       # we're displaying only the very last section, we still need two DB queries to find the titles
+       $stopat = ( $offset + $toplevelMaxperpage < $sections )
+                 ? $offset + $toplevelMaxperpage : $sections ;
+
+       # This array is going to hold the cur_titles in order.
+       $lines = array();
+
+       # If we are going to show n rows, we need n+1 queries to find the relevant titles.
+       for ( $i = $offset; $i <= $stopat; $i++ ) {
+               if ( $i == $sections )                  # if we're displaying the last section, we need to
+                       $from = $count-1;                       # find the last cur_title in the DB
+               else if ( $i > $offset )
+                       $from = $i * $indexMaxperpage - 1;
+               else
+                       $from = $i * $indexMaxperpage;
+               $limit = ( $i == $offset || $i == $stopat ) ? 1 : 2;
+               $sql = "SELECT cur_title $fromwhere $order_str " . $dbr->limitResult ( $limit, $from );
+               echo "($offset/$stopat) $sql<br>\n";
                $res = $dbr->query( $sql, $fname );
-
                $s = $dbr->fetchObject( $res );
-               $outpoint = $s->cur_title;
-               $out .= indexShowline( $inpoint, $outpoint );
+               array_push ( $lines, $s->cur_title );
+               if ( $s = $dbr->fetchObject( $res ) ) {
+                       array_push ( $lines, $s->cur_title );
+               }
+               $dbr->freeResult( $res );
+       }
 
-               $s = $dbr->fetchObject( $res );
-               $inpoint = $s->cur_title;
+       # At this point, $lines should contain an even number of elements.
+       $out .= "<table style='background: inherit;'>";
+       while ( count ( $lines ) > 0 ) {
+               $inpoint = array_shift ( $lines );
+               $outpoint = array_shift ( $lines );
+               $out .= indexShowline ( $inpoint, $outpoint, $namespace );
+       }
+       $out .= "</table>";
 
-               $dbr->freeResult( $res );
+       $nsForm = namespaceForm ( $namespace );
+
+       # Is there more?
+       $morelinks = "";
+       if ( $offset > 0 ) {
+               $morelinks = $sk->makeKnownLink (
+                       $wgLang->specialPage ( "Allpages" ),
+                       wfMsg ( 'allpagesprev' ),
+                       ( $offset > $toplevelMaxperpage ) ? 'offset='.($offset-$toplevelMaxperpage) : ''
+               );
+       }
+       if ( $stopat < $sections-1 ) {
+               if ( $morelinks != "" ) { $morelinks .= " | "; }
+               $morelinks .= $sk->makeKnownLink (
+                       $wgLang->specialPage ( "Allpages" ),
+                       wfMsg ( 'allpagesnext' ),
+                       'offset=' . ($offset + $toplevelMaxperpage)
+               );
        }
 
-       $from = $i * $indexMaxperpage;
-       $sql = "SELECT cur_title $fromwhere $order ".wfLimitResult(1,$count-1);
-       $res = $dbr->query( $sql, $fname );
-       $s = $dbr->fetchObject( $res );
-       $outpoint = $s->cur_title;
-       $out .= indexShowline( $inpoint, $outpoint );
-       $out .= "</table>\n";
+       if ( $morelinks != "" ) {
+               $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
+               $out2 .= '<tr valign="top"><td align="left">' . $nsForm;
+               $out2 .= '</td><td align="right" style="font-size: smaller; margin-bottom: 1em;">';
+               $out2 .= $morelinks . '</td></tr></table><hr />';
+       } else {
+               $out2 = $nsForm . '<hr />';
+       }
 
        # Saving cache
        $log->replaceContent( $out );
 
-       $wgOut->addHtml( $out );
+       $wgOut->addHtml( $out2 . $out );
 }
 
-function indexShowline( $inpoint, $outpoint )
+function indexShowline( $inpoint, $outpoint, $namespace = 0 )
 {
        global $wgOut, $wgLang, $wgUser;
        $sk = $wgUser->getSkin();
        $dbr =& wfGetDB( DB_SLAVE );
 
-       # Fixme: this is ugly
+       $inpointf = str_replace( "_", " ", $inpoint );
+       $outpointf = str_replace( "_", " ", $outpoint );
+       $queryparams = 'from=' . $dbr->strencode( $inpoint );
+       if ( $namespace > 0 ) { $queryparams .= '&namespace='.intval($namespace); }
        $out = wfMsg(
-               "alphaindexline",
-               $sk->makeKnownLink( $wgLang->specialPage( "Allpages" ),
-                       str_replace( "_", " ", $inpoint ),
-                       "from=" . $dbr->strencode( $inpoint ) ) . "</td><td>",
-               "</td><td align=\"left\">" .
-               str_replace( "_", " ", $outpoint )
-               );
-       return "<tr><td align=\"right\">{$out}</td></tr>\n";
+               'alphaindexline',
+               $sk->makeKnownLink( $wgLang->specialPage( "Allpages" ), $inpointf, $queryparams ) . '</td><td>',
+               '</td><td align="left">' . $outpointf
+       );
+       return '<tr><td align="right">'.$out.'</td></tr>';
 }
 
 function indexShowChunk( $from, $namespace = 0 )
@@ -110,38 +190,41 @@ function indexShowChunk( $from, $namespace = 0 )
        ### FIXME: side link to previous
 
        $n = 0;
-       $out = "<table border=\"0\" width=\"100%\">\n";
+       $out = '<table style="background: inherit;" border="0" width="100%">';
        while( ($n < $indexMaxperpage) && ($s = $dbr->fetchObject( $res )) ) {
                $t = Title::makeTitle( $namespacee, $s->cur_title );
                if( $t ) {
-                       $link = $sk->makeKnownLinkObj( $t );
+                       $link = $sk->makeKnownLinkObj( $t, $t->getText() );
                } else {
-                       $link = "[[" . htmlspecialchars( $s->cur_title ) . "]]";
+                       $link = '[[' . htmlspecialchars( $s->cur_title ) . ']]';
                }
                if( $n % 3 == 0 ) {
-                       $out .= "<tr>\n";
+                       $out .= '<tr>';
                }
                $out .= "<td>$link</td>";
                $n++;
                if( $n % 3 == 0 ) {
-                       $out .= "</tr>\n";
+                       $out .= '</tr>';
                }
        }
        if( ($n % 3) != 0 ) {
-               $out .= "</tr>\n";
+               $out .= '</tr>';
        }
-       $out .= "</table>";
+       $out .= '</table>';
 
-       $out2 = "<div style='text-align: right; font-size: smaller; margin-bottom: 1em;'>" .
+       $nsForm = namespaceForm ( $namespace, $from );
+       $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
+       $out2 .= '<tr valign="top"><td align="left">' . $nsForm;
+       $out2 .= '</td><td align="right" style="font-size: smaller; margin-bottom: 1em;">' .
                        $sk->makeKnownLink( $wgLang->specialPage( "Allpages" ),
                                wfMsg ( 'allpages' ) );
        if ( ($n == $indexMaxperpage) && ($s = $dbr->fetchObject( $res )) ) {
                $out2 .= " | " . $sk->makeKnownLink(
                        $wgLang->specialPage( "Allpages" ),
                        wfMsg ( 'nextpage', $s->cur_title ),
-                       "from=" . $dbr->strencode( $s->cur_title ) );
+                       "from=" . wfUrlEncode ( $s->cur_title ) );
        }
-       $out2 .= "</div>";
+       $out2 .= "</td></tr></table><hr />";
 
        $wgOut->addHtml( $out2 . $out );
 }

diff --git a/languages/Language.php b/languages/Language.php
index a3dea4f..eb34023 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -971,7 +971,6 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
 'wantedpages'  => 'Wanted pages',
 'nlinks'               => '$1 links',
 'allpages'             => 'All pages',
-'nextpage'             => 'Next page ($1)',
 'randompage'   => 'Random page',
 'shortpages'   => 'Short pages',
 'longpages'            => 'Long pages',
@@ -1006,6 +1005,15 @@ this list should not be construed as an endorsement.",
 'alphaindexline' => "$1 to $2",
 'version'              => 'Version',
 
+# Specific to All pages
+'nextpage'          => 'Next page ($1)',
+'articlenamespace'  => '(articles)',
+'allpagesformtext'  => 'Display pages starting at: $1 Choose namespace: $2 $3',
+'allarticles'       => 'All articles',
+'allpagesprev'      => 'Previous',
+'allpagesnext'      => 'Next',
+'allpagesnamespace' => 'All pages ($1 namespace)',
+
 # Email this user
 #
 'mailnologin'  => 'No send address',