Use Linker::link() instead of Linker::linkKnown() when having options
[lhc/web/wiklou.git] / includes / specials / SpecialAllpages.php
index bb4c1d7..0f8b255 100644 (file)
@@ -30,24 +30,37 @@ class SpecialAllpages extends IncludableSpecialPage {
 
        /**
         * Maximum number of pages to show on single subpage.
+        *
+        * @var int $maxPerPage
         */
        protected $maxPerPage = 345;
 
        /**
         * Maximum number of pages to show on single index subpage.
+        *
+        * @var int $maxLineCount
         */
        protected $maxLineCount = 100;
 
        /**
         * Maximum number of chars to show for an entry.
+        *
+        * @var int $maxPageLength
         */
        protected $maxPageLength = 70;
 
        /**
         * Determines, which message describes the input field 'nsfrom'.
+        *
+        * @var string $nsfromMsg
         */
        protected $nsfromMsg = 'allpagesfrom';
 
+       /**
+        * Constructor
+        *
+        * @param $name string: name of the special page, as seen in links and URLs (default: 'Allpages')
+        */
        function __construct( $name = 'Allpages' ){
                parent::__construct( $name );
        }
@@ -64,33 +77,29 @@ class SpecialAllpages extends IncludableSpecialPage {
 
                $this->setHeaders();
                $this->outputHeader();
-               $this->allowClickjacking();
+               $out->allowClickjacking();
 
                # GET values
                $from = $request->getVal( 'from', null );
                $to = $request->getVal( 'to', null );
                $namespace = $request->getInt( 'namespace' );
+               $hideredirects = $request->getBool( 'hideredirects', false );
 
                $namespaces = $wgContLang->getNamespaces();
 
-               if( !$this->including() ) {
-                       $out->setPagetitle(
-                               ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) ) ?
-                               wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
-                               wfMsg( 'allarticles' )
-                       );
-                       // Note: The following will not end up in the parser output cache as
-                       // a result even if we wanted to load it on pages including the
-                       // special page it would be unstable.
-                       $out->addModuleStyles( 'mediawiki.special' );
-               }
+               $out->setPageTitle(
+                       ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) ) ?
+                       $this->msg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
+                       $this->msg( 'allarticles' )
+               );
+               $out->addModuleStyles( 'mediawiki.special' );
 
-               if( isset($par) ) {
-                       $this->showChunk( $namespace, $par, $to );
-               } elseif( isset($from) && !isset($to) ) {
-                       $this->showChunk( $namespace, $from, $to );
+               if( $par !== null ) {
+                       $this->showChunk( $namespace, $par, $to, $hideredirects );
+               } elseif( $from !== null && $to === null ) {
+                       $this->showChunk( $namespace, $from, $to, $hideredirects );
                } else {
-                       $this->showToplevel( $namespace, $from, $to );
+                       $this->showToplevel( $namespace, $from, $to, $hideredirects );
                }
        }
 
@@ -100,8 +109,10 @@ class SpecialAllpages extends IncludableSpecialPage {
         * @param $namespace Integer: a namespace constant (default NS_MAIN).
         * @param $from String: dbKey we are starting listing at.
         * @param $to String: dbKey we are ending listing at.
+        * @param $hideredirects Bool: dont show redirects  (default FALSE)
+        * @return string
         */
-       function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '' ) {
+       function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '', $hideredirects = false ) {
                global $wgScript;
                $t = $this->getTitle();
 
@@ -109,11 +120,11 @@ class SpecialAllpages extends IncludableSpecialPage {
                $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
                $out .= Html::hidden( 'title', $t->getPrefixedText() );
                $out .= Xml::openElement( 'fieldset' );
-               $out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
+               $out .= Xml::element( 'legend', null, $this->msg( 'allpages' )->text() );
                $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
                $out .= "<tr>
        <td class='mw-label'>" .
-                       Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
+                       Xml::label( $this->msg( 'allpagesfrom' )->text(), 'nsfrom' ) .
                        "       </td>
        <td class='mw-input'>" .
                        Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
@@ -121,7 +132,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 </tr>
 <tr>
        <td class='mw-label'>" .
-                       Xml::label( wfMsg( 'allpagesto' ), 'nsto' ) .
+                       Xml::label( $this->msg( 'allpagesto' )->text(), 'nsto' ) .
                        "       </td>
                        <td class='mw-input'>" .
                        Xml::input( 'to', 30, str_replace('_',' ',$to), array( 'id' => 'nsto' ) ) .
@@ -129,11 +140,20 @@ class SpecialAllpages extends IncludableSpecialPage {
 </tr>
 <tr>
        <td class='mw-label'>" .
-                       Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+                       Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) .
                        "       </td>
                        <td class='mw-input'>" .
-                       Xml::namespaceSelector( $namespace, null ) . ' ' .
-                       Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
+                       Html::namespaceSelector(
+                               array( 'selected' => $namespace ),
+                               array( 'name' => 'namespace', 'id' => 'namespace' )
+                       ) . ' ' .
+                       Xml::checkLabel(
+                               $this->msg( 'allpages-hide-redirects' )->text(),
+                               'hideredirects',
+                               'hideredirects',
+                               $hideredirects
+                       ) . ' ' .
+                       Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) .
                        "       </td>
 </tr>";
                $out .= Xml::closeElement( 'table' );
@@ -147,8 +167,9 @@ class SpecialAllpages extends IncludableSpecialPage {
         * @param $namespace Integer (default NS_MAIN)
         * @param $from String: list all pages from this name
         * @param $to String: list all pages to this name
+        * @param $hideredirects Bool: dont show redirects (default FALSE)
         */
-       function showToplevel( $namespace = NS_MAIN, $from = '', $to = '' ) {
+       function showToplevel( $namespace = NS_MAIN, $from = '', $to = '', $hideredirects = false ) {
                $output = $this->getOutput();
 
                # TODO: Either make this *much* faster or cache the title index points
@@ -158,6 +179,10 @@ class SpecialAllpages extends IncludableSpecialPage {
                $out = "";
                $where = array( 'page_namespace' => $namespace );
 
+               if ( $hideredirects ) {
+                       $where[ 'page_is_redirect' ] = 0;
+               }
+
                $from = Title::makeTitleSafe( $namespace, $from );
                $to = Title::makeTitleSafe( $namespace, $to );
                $from = ( $from && $from->isLocal() ) ? $from->getDBkey() : null;
@@ -226,9 +251,9 @@ class SpecialAllpages extends IncludableSpecialPage {
                // Instead, display the first section directly.
                if( count( $lines ) <= 2 ) {
                        if( !empty($lines) ) {
-                               $this->showChunk( $namespace, $from, $to );
+                               $this->showChunk( $namespace, $from, $to, $hideredirects );
                        } else {
-                               $output->addHTML( $this->namespaceForm( $namespace, $from, $to ) );
+                               $output->addHTML( $this->namespaceForm( $namespace, $from, $to, $hideredirects ) );
                        }
                        return;
                }
@@ -238,10 +263,10 @@ class SpecialAllpages extends IncludableSpecialPage {
                while( count ( $lines ) > 0 ) {
                        $inpoint = array_shift( $lines );
                        $outpoint = array_shift( $lines );
-                       $out .= $this->showline( $inpoint, $outpoint, $namespace );
+                       $out .= $this->showline( $inpoint, $outpoint, $namespace, $hideredirects );
                }
                $out .= Xml::closeElement( 'table' );
-               $nsForm = $this->namespaceForm( $namespace, $from, $to );
+               $nsForm = $this->namespaceForm( $namespace, $from, $to, $hideredirects );
 
                # Is there more?
                if( $this->including() ) {
@@ -254,7 +279,7 @@ class SpecialAllpages extends IncludableSpecialPage {
                                                                $nsForm .
                                                        '</td>
                                                        <td class="mw-allpages-nav">' .
-                                                               $this->getSkin()->link( $this->getTitle(), wfMsgHtml ( 'allpages' ),
+                                                               Linker::link( $this->getTitle(), $this->msg( 'allpages' )->escaped(),
                                                                        array(), array(), 'known' ) .
                                                        "</td>
                                                </tr>" .
@@ -272,8 +297,10 @@ class SpecialAllpages extends IncludableSpecialPage {
         * @param $inpoint String: lower limit of pagenames
         * @param $outpoint String: upper limit of pagenames
         * @param $namespace Integer (Default NS_MAIN)
+        * @param $hideredirects Bool: dont show redirects (default FALSE)
+        * @return string
         */
-       function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
+       function showline( $inpoint, $outpoint, $namespace = NS_MAIN, $hideredirects ) {
                global $wgContLang;
                $inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) );
                $outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint ) );
@@ -282,13 +309,19 @@ class SpecialAllpages extends IncludableSpecialPage {
                $outpointf = $wgContLang->truncate( $outpointf, $this->maxPageLength );
 
                $queryparams = $namespace ? "namespace=$namespace&" : '';
+
+               $queryhideredirects = array();
+               if ($hideredirects) {
+                       $queryhideredirects[ 'hideredirects' ] = 1;
+               }
+
                $special = $this->getTitle();
-               $link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) );
+               $link = htmlspecialchars( $special->getLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint), $queryhideredirects ) );
 
-               $out = wfMsgHtml( 'alphaindexline',
+               $out = $this->msg( 'alphaindexline' )->rawParams(
                        "<a href=\"$link\">$inpointf</a></td><td>",
                        "</td><td><a href=\"$link\">$outpointf</a>"
-               );
+               )->escaped();
                return '<tr><td class="mw-allpages-alphaindexline">' . $out . '</td></tr>';
        }
 
@@ -296,11 +329,11 @@ class SpecialAllpages extends IncludableSpecialPage {
         * @param $namespace Integer (Default NS_MAIN)
         * @param $from String: list all pages from this name (default FALSE)
         * @param $to String: list all pages to this name (default FALSE)
+        * @param $hideredirects Bool: dont show redirects (default FALSE)
         */
-       function showChunk( $namespace = NS_MAIN, $from = false, $to = false ) {
-               global $wgContLang, $wgLang;
+       function showChunk( $namespace = NS_MAIN, $from = false, $to = false, $hideredirects = false ) {
+               global $wgContLang;
                $output = $this->getOutput();
-               $sk = $this->getSkin();
 
                $fromList = $this->getNamespaceKeyAndText($namespace, $from);
                $toList = $this->getNamespaceKeyAndText( $namespace, $to );
@@ -308,10 +341,10 @@ class SpecialAllpages extends IncludableSpecialPage {
                $n = 0;
 
                if ( !$fromList || !$toList ) {
-                       $out = wfMsgExt( 'allpagesbadtitle', 'parse' );
+                       $out = $this->msg( 'allpagesbadtitle' )->parseAsBlock();
                } elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) {
                        // Show errormessage and reset to NS_MAIN
-                       $out = wfMsgExt( 'allpages-bad-ns', array( 'parseinline' ), $namespace );
+                       $out = $this->msg( 'allpages-bad-ns', $namespace )->parse();
                        $namespace = NS_MAIN;
                } else {
                        list( $namespace, $fromKey, $from ) = $fromList;
@@ -322,6 +355,11 @@ class SpecialAllpages extends IncludableSpecialPage {
                                'page_namespace' => $namespace,
                                'page_title >= ' . $dbr->addQuotes( $fromKey )
                        );
+
+                       if ( $hideredirects ) {
+                               $conds[ 'page_is_redirect' ] = 0;
+                       }
+
                        if( $toKey !== "" ) {
                                $conds[] = 'page_title <= ' . $dbr->addQuotes( $toKey );
                        }
@@ -343,7 +381,7 @@ class SpecialAllpages extends IncludableSpecialPage {
                                        $t = Title::newFromRow( $s );
                                        if( $t ) {
                                                $link = ( $s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
-                                                       $sk->link( $t ) .
+                                                       Linker::link( $t ) .
                                                        ($s->page_is_redirect ? '</div>' : '' );
                                        } else {
                                                $link = '[[' . htmlspecialchars( $s->page_title ) . ']]';
@@ -409,14 +447,14 @@ class SpecialAllpages extends IncludableSpecialPage {
 
                        $self = $this->getTitle();
 
-                       $nsForm = $this->namespaceForm( $namespace, $from, $to );
+                       $nsForm = $this->namespaceForm( $namespace, $from, $to, $hideredirects );
                        $out2 = Xml::openElement( 'table', array( 'class' => 'mw-allpages-table-form' ) ).
                                                '<tr>
                                                        <td>' .
                                                                $nsForm .
                                                        '</td>
                                                        <td class="mw-allpages-nav">' .
-                                                               $sk->link( $self, wfMsgHtml ( 'allpages' ) );
+                                                               Linker::link( $self, $this->msg( 'allpages' )->escaped() );
 
                        # Do we put a previous link ?
                        if( isset( $prevTitle ) &&  $pt = $prevTitle->getText() ) {
@@ -425,30 +463,36 @@ class SpecialAllpages extends IncludableSpecialPage {
                                if( $namespace )
                                        $query['namespace'] = $namespace;
 
-                               $prevLink = $sk->linkKnown(
+                               if( $hideredirects )
+                                       $query['hideredirects'] = $hideredirects;
+
+                               $prevLink = Linker::linkKnown(
                                        $self,
-                                       wfMessage( 'prevpage', $pt )->escaped(),
+                                       $this->msg( 'prevpage', $pt )->escaped(),
                                        array(),
                                        $query
                                );
-                               $out2 = $wgLang->pipeList( array( $out2, $prevLink ) );
+                               $out2 = $this->getLanguage()->pipeList( array( $out2, $prevLink ) );
                        }
 
                        if( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
                                # $s is the first link of the next chunk
-                               $t = Title::MakeTitle($namespace, $s->page_title);
+                               $t = Title::makeTitle($namespace, $s->page_title);
                                $query = array( 'from' => $t->getText() );
 
                                if( $namespace )
                                        $query['namespace'] = $namespace;
 
-                               $nextLink = $sk->linkKnown(
+                               if( $hideredirects )
+                                       $query['hideredirects'] = $hideredirects;
+
+                               $nextLink = Linker::linkKnown(
                                        $self,
-                                       wfMessage( 'nextpage', $t->getText() )->escaped(),
+                                       $this->msg( 'nextpage', $t->getText() )->escaped(),
                                        array(),
                                        $query
                                );
-                               $out2 = $wgLang->pipeList( array( $out2, $nextLink ) );
+                               $out2 = $this->getLanguage()->pipeList( array( $out2, $nextLink ) );
                        }
                        $out2 .= "</td></tr></table>";
                }
@@ -463,7 +507,7 @@ class SpecialAllpages extends IncludableSpecialPage {
                        $output->addHTML(
                                Html::element( 'hr' ) .
                                Html::rawElement( 'div', array( 'class' => 'mw-allpages-nav' ),
-                                       $wgLang->pipeList( $links )
+                                       $this->getLanguage()->pipeList( $links )
                                ) );
                }
 
@@ -473,17 +517,15 @@ class SpecialAllpages extends IncludableSpecialPage {
         * @param $ns Integer: the namespace of the article
         * @param $text String: 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) {
+       protected 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 ) {
+               } elseif ( $t ) {
                        return null;
                }