Don't require an existence check before calling loadPageData(). Added an accessor...

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

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index a60324d..b73d5b6 100644 (file)
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once( "QueryPage.php" );
+require_once( 'QueryPage.php' );
 
 /**
  *
@@ -16,15 +16,19 @@ require_once( "QueryPage.php" );
  * @subpackage SpecialPage
  */
 class NewPagesPage extends QueryPage {
+       var $namespace;
+
+       function NewPagesPage( $namespace = NS_MAIN ) {
+               $this->namespace = $namespace;
+       }
 
        function getName() {
-               return "Newpages";
+               return 'Newpages';
        }
 
        function isExpensive() {
                # Indexed on RC, and will *not* work with querycache yet.
                return false;
-               #return parent::isExpensive();
        }
 
        function getSQL() {
@@ -37,21 +41,22 @@ class NewPagesPage extends QueryPage {
                # FIXME: text will break with compression
                return
                        "SELECT 'Newpages' as type,
-                               rc_namespace AS namespace,
-                               rc_title AS title,
-                               rc_cur_id AS value,
-                               rc_user AS user,
-                               rc_user_text AS user_text,
-                               rc_comment as comment,
-                               rc_timestamp AS timestamp,
-                               '{$usepatrol}' as usepatrol,
-                               rc_patrolled AS patrolled,
-                               rc_id AS rcid,
-                               page_len as length,
-                               page_latest as rev_id
+                               rc_namespace AS namespace,
+                               rc_title AS title,
+                               rc_cur_id AS cur_id,
+                               rc_user AS user,
+                               rc_user_text AS user_text,
+                               rc_comment as comment,
+                               rc_timestamp AS timestamp,
+                               rc_timestamp AS value,
+                               '{$usepatrol}' as usepatrol,
+                               rc_patrolled AS patrolled,
+                               rc_id AS rcid,
+                               page_len as length,
+                               page_latest as rev_id
                        FROM $recentchanges,$page
                        WHERE rc_cur_id=page_id AND rc_new=1
-                         AND rc_namespace=".NS_MAIN." AND page_is_redirect=0";
+                       AND rc_namespace=" . $this->namespace . " AND page_is_redirect=0";
        }
 
        function formatResult( $skin, $result ) {
@@ -59,25 +64,28 @@ class NewPagesPage extends QueryPage {
                $u = $result->user;
                $ut = $result->user_text;
 
-               $length = wfMsg( "nbytes", $wgLang->formatNum( $result->length ) );
+               $length = wfMsg( 'nbytes', $wgLang->formatNum( $result->length ) );
 
                if ( $u == 0 ) { # not by a logged-in user
-                       $ul = $ut;
-               }
-               else {
-                       $ul = $skin->makeLink( $wgContLang->getNsText(NS_USER) . ":{$ut}", $ut );
+                       $userPage = Title::makeTitle( NS_SPECIAL, 'Contributions' );
+                       $linkParams = 'target=' . urlencode( $ut );
+               } else {
+                       $userPage = Title::makeTitle( NS_USER, $ut );
+                       $linkParams = '';
                }
+               $ul = $skin->makeLinkObj( $userPage, htmlspecialchars( $ut ), $linkParams );
 
                $d = $wgLang->timeanddate( $result->timestamp, true );
 
                # Since there is no diff link, we need to give users a way to
                # mark the article as patrolled if it isn't already
+               $ns = $wgContLang->getNsText( $result->namespace );
                if ( $wgUseRCPatrol && !is_null ( $result->usepatrol ) && $result->usepatrol &&
                     $result->patrolled == 0 && $wgUser->isLoggedIn() &&
                     ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
-                       $link = $skin->makeKnownLink( $result->title, '', "rcid={$result->rcid}" );
+                       $link = $skin->makeKnownLink( $ns . ':' . $result->title, '', "rcid={$result->rcid}" );
                else
-                       $link = $skin->makeKnownLink( $result->title, '' );
+                       $link = $skin->makeKnownLink( $ns . ':' . $result->title, '' );
 
                $s = "{$d} {$link} ({$length}) . . {$ul}";
 
@@ -85,7 +93,7 @@ class NewPagesPage extends QueryPage {
 
                return $s;
        }
-       
+
        function feedItemDesc( $row ) {
                if( isset( $row->rev_id ) ) {
                        $revision = Revision::newFromId( $row->rev_id );
@@ -101,16 +109,39 @@ class NewPagesPage extends QueryPage {
 /**
  * constructor
  */
-function wfSpecialNewpages()
-{
-       global $wgRequest;
-    list( $limit, $offset ) = wfCheckLimits();
+function wfSpecialNewpages($par, $specialPage) {
+       global $wgRequest, $wgContLang;
+
+       list( $limit, $offset ) = wfCheckLimits();
+       $namespace = NS_MAIN;
+
+       if ( $par ) {
+               $bits = preg_split( '/\s*,\s*/', trim( $par ) );
+               foreach ( $bits as $bit ) {
+                       if ( 'shownav' == $bit )
+                               $shownavigation = true;
+                       if ( is_numeric( $bit ) )
+                               $limit = $bit;
+
+                       if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) )
+                               $limit = intval($m[1]);
+                       if ( preg_match( '/^offset=(\d+)$/', $bit, $m ) )
+                               $offset = intval($m[1]);
+                       if ( preg_match( '/^namespace=(.*)$/', $bit, $m ) ) {
+                               $ns = $wgContLang->getNsIndex( $m[1] );
+                               if( $ns !== false ) {
+                                       $namespace = $ns;
+                               }
+                       }
+               }
+       }
+       if ( ! isset( $shownavigation ) )
+               $shownavigation = ! $specialPage->including();
 
-    $npp = new NewPagesPage();
+       $npp = new NewPagesPage( $namespace );
 
-    if( !$npp->doFeed( $wgRequest->getVal( 'feed' ) ) ) {
-           $npp->doQuery( $offset, $limit );
-       }
+       if ( ! $npp->doFeed( $wgRequest->getVal( 'feed' ) ) )
+               $npp->doQuery( $offset, $limit, $shownavigation );
 }
 
 ?>