* (bug 9403) Sanitize newlines from search term input

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

diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php
index a079759..35326b2 100644 (file)
--- a/includes/SpecialAllpages.php
+++ b/includes/SpecialAllpages.php
@@ -38,11 +38,21 @@ function wfSpecialAllpages( $par=NULL, $specialPage ) {
  * @addtogroup SpecialPage
  */
 class SpecialAllpages {
-       var $maxPerPage=960;
-       var $topLevelMax=50;
-       var $name='Allpages';
-       # Determines, which message describes the input field 'nsfrom' (->SpecialPrefixindex.php)
-       var $nsfromMsg='allpagesfrom';
+       /**
+        * Maximum number of pages to show on single subpage.
+        */
+       protected $maxPerPage = 960;
+
+       /**
+        * Name of this special page. Used to make title objects that reference back
+        * to this page.
+        */
+       protected $name = 'Allpages';
+
+       /**
+        * Determines, which message describes the input field 'nsfrom'.
+        */
+       protected $nsfromMsg = 'allpagesfrom';
 
 /**
  * HTML for the top form
@@ -50,32 +60,34 @@ class SpecialAllpages {
  * @param string $from Article name we are starting listing at.
  */
 function namespaceForm ( $namespace = NS_MAIN, $from = '' ) {
-       global $wgScript, $wgContLang;
+       global $wgScript;
        $t = SpecialPage::getTitleFor( $this->name );
-       $align = $wgContLang->isRtl() ? 'left' : 'right';
 
        $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 align='$align'>" .
+                       <td class='mw-label'>" .
                                Xml::label( wfMsg( $this->nsfromMsg ), 'nsfrom' ) .
                        "</td>
-                       <td>" .
-                               Xml::input( 'from', 20, htmlspecialchars ( $from ), array( 'id' => 'nsfrom' ) ) .
+                       <td class='mw-input'>" .
+                               Xml::input( 'from', 20, $from, array( 'id' => 'nsfrom' ) ) .
                        "</td>
                </tr>
                <tr>
-                       <td align='$align'>" .
+                       <td class='mw-label'>" .
                                Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
                        "</td>
-                       <td>" .
-                               Xml::namespaceSelector( $namespace, null ) .
+                       <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;
@@ -86,7 +98,6 @@ function namespaceForm ( $namespace = NS_MAIN, $from = '' ) {
  */
 function showToplevel ( $namespace = NS_MAIN, $including = false ) {
        global $wgOut, $wgContLang;
-       $fname = "indexShowToplevel";
        $align = $wgContLang->isRtl() ? 'left' : 'right';
 
        # TODO: Either make this *much* faster or cache the title index points
@@ -101,7 +112,11 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
        $lines = $wgMemc->get( $key );
 
        if( !is_array( $lines ) ) {
-               $firstTitle = $dbr->selectField( 'page', 'page_title', $where, $fname, array( 'LIMIT' => 1 ) );
+               $options = array( 'LIMIT' => 1 );
+               if ( ! $dbr->implicitOrderby() ) {
+                       $options['ORDER BY'] = 'page_title';
+               }
+               $firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options );
                $lastTitle = $firstTitle;
 
                # This array is going to hold the page_titles in order.
@@ -117,8 +132,8 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
                        $res = $dbr->select(
                                'page', /* FROM */
                                'page_title', /* WHAT */
-                               $where + array( $chunk),
-                               $fname,
+                               $where + array($chunk),
+                               __METHOD__,
                                array ('LIMIT' => 2, 'OFFSET' => $this->maxPerPage - 1, 'ORDER BY' => 'page_title') );
 
                        if ( $s = $dbr->fetchObject( $res ) ) {
@@ -129,7 +144,7 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
                                        array(
                                                'page_namespace' => $namespace,
                                                $chunk
-                                       ), $fname );
+                                       ), __METHOD__ );
                                array_push( $lines, $endTitle );
                                $done = true;
                        }
@@ -161,7 +176,7 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
                $out .= $this->showline ( $inpoint, $outpoint, $namespace, false );
        }
        $out .= '</table>';
-       $nsForm = $this->namespaceForm ( $namespace, '', false );
+       $nsForm = $this->namespaceForm( $namespace, '', false );
 
        # Is there more?
        if ( $including ) {
@@ -210,7 +225,6 @@ function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
 function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
        global $wgOut, $wgUser, $wgContLang;
 
-       $fname = 'indexShowChunk';
        $sk = $wgUser->getSkin();
 
        $fromList = $this->getNamespaceKeyAndText($namespace, $from);
@@ -235,7 +249,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                                'page_namespace' => $namespace,
                                'page_title >= ' . $dbr->addQuotes( $fromKey )
                        ),
-                       $fname,
+                       __METHOD__,
                        array(
                                'ORDER BY'  => 'page_title',
                                'LIMIT'     => $this->maxPerPage + 1,
@@ -257,7 +271,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                        if( $n % 3 == 0 ) {
                                $out .= '<tr>';
                        }
-                       $out .= "<td>$link</td>";
+                       $out .= "<td width=\"33%\">$link</td>";
                        $n++;
                        if( $n % 3 == 0 ) {
                                $out .= '</tr>';
@@ -282,7 +296,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                                'page',
                                'page_title',
                                array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ),
-                               $fname,
+                               __METHOD__,
                                array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) )
                        );
 
@@ -293,8 +307,11 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                        } else {
                                # The previous chunk is not complete, need to link to the very first title
                                # available in the database
-                               $reallyFirstPage_title = $dbr->selectField( 'page', 'page_title', array( 'page_namespace' => $namespace ), $fname, array( 'LIMIT' => 1) );
-
+                               $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 );
@@ -304,7 +321,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                        }
                }
 
-               $nsForm = $this->namespaceForm ( $namespace, $from );
+               $nsForm = $this->namespaceForm( $namespace, $from );
                $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;">' .
@@ -377,4 +394,4 @@ function getNamespaceKeyAndText ($ns, $text) {
 }
 }
 
-
+?>