X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialNewpages.php;h=cdf1b10f8c0189a7ab2e703f9f64126bb3420b40;hb=7a9219be74758313796d2c17684ae2c6e95cf728;hp=b388533d419be7fa77683427e2298e432d711cff;hpb=9a1c22462c0cb544a8fba27a9b9d4f4b0c157e68;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index b388533d41..cdf1b10f8c 100644
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -5,11 +5,6 @@
  * @subpackage SpecialPage
  */
 
-/**
- *
- */
-require_once( 'QueryPage.php' );
-
 /**
  *
  * @package MediaWiki
@@ -17,7 +12,7 @@ require_once( 'QueryPage.php' );
  */
 class NewPagesPage extends QueryPage {
 	var $namespace;
-	
+
 	function NewPagesPage( $namespace = NS_MAIN ) {
 		$this->namespace = $namespace;
 	}
@@ -32,78 +27,125 @@ class NewPagesPage extends QueryPage {
 	}
 
 	function getSQL() {
-		global $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
-		$usepatrol = ( $wgUseRCPatrol && $wgUser->isLoggedIn() &&
-		               ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
+		global $wgUser, $wgUseRCPatrol;
+		$usepatrol = ( $wgUseRCPatrol && $wgUser->isAllowed( 'patrol' ) ) ? 1 : 0;
 		$dbr =& wfGetDB( DB_SLAVE );
 		extract( $dbr->tableNames( 'recentchanges', 'page', 'text' ) );
 
 		# FIXME: text will break with compression
 		return
 			"SELECT 'Newpages' as type,
-			        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
+				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=" . $this->namespace . " AND page_is_redirect=0";
 	}
+	
+	function preprocessResults( &$dbo, &$res ) {
+		# Do a batch existence check on the user and talk pages
+		$linkBatch = new LinkBatch();
+		while( $row = $dbo->fetchObject( $res ) ) {
+			$linkBatch->addObj( Title::makeTitleSafe( NS_USER, $row->user_text ) );
+			$linkBatch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_text ) );
+		}
+		$linkBatch->execute();
+		# Seek to start
+		if( $dbo->numRows( $res ) > 0 )
+			$dbo->dataSeek( $res, 0 );
+	}
 
 	function formatResult( $skin, $result ) {
-		global $wgLang, $wgContLang, $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
+		global $wgLang, $wgContLang, $wgUser, $wgUseRCPatrol;
 		$u = $result->user;
 		$ut = $result->user_text;
+		$dirmark = $wgContLang->getDirMark(); // To keep text in correct order
 
-		$length = wfMsg( 'nbytes', $wgLang->formatNum( $result->length ) );
-
-		if ( $u == 0 ) { # not by a logged-in user
-			$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 );
-
+		$length = wfMsgExt( 'nbytes', array('parsemag', 'escape'),
+			$wgLang->formatNum( $result->length ) );
 		$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 ) )
+		if( $wgUseRCPatrol && !is_null( $result->usepatrol ) && $result->usepatrol && $result->patrolled == 0 && $wgUser->isAllowed( 'patrol' ) ) {
 			$link = $skin->makeKnownLink( $ns . ':' . $result->title, '', "rcid={$result->rcid}" );
-		else
+		} else {
 			$link = $skin->makeKnownLink( $ns . ':' . $result->title, '' );
+		}
 
-		$s = "{$d} {$link} ({$length}) . . {$ul}";
-
-		$s .= $skin->commentBlock( $result->comment );
+		$userLink = $skin->userLink( $u, $ut );
+		$userTools = $skin->userToolLinks( $u, $ut );
 
+		$s = "{$d} {$dirmark}{$link} {$dirmark}({$length}) . . " .
+			"{$dirmark}{$userLink}{$dirmark}{$userTools}";
+		$s .= $dirmark . $skin->commentBlock( $result->comment );
 		return $s;
 	}
-	
+
 	function feedItemDesc( $row ) {
 		if( isset( $row->rev_id ) ) {
 			$revision = Revision::newFromId( $row->rev_id );
 			if( $revision ) {
-				return '<p>' . htmlspecialchars( wfMsg( 'summary' ) ) . ': ' . $text . "</p>\n<hr />\n<div>" .
+				return '<p>' . htmlspecialchars( wfMsg( 'summary' ) ) . ': ' .
+					htmlspecialchars( $revision->getComment() ) . "</p>\n<hr />\n<div>" .
 					nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";
 			}
 		}
 		return parent::feedItemDesc( $row );
 	}
+	
+	/**
+	 * Show a namespace selection form for filtering
+	 *
+	 * @return string
+	 */	
+	function getPageHeader() {
+		$thisTitle = Title::makeTitle( NS_SPECIAL, $this->getName() );
+		$form  = wfOpenElement( 'form', array(
+			'method' => 'post',
+			'action' => $thisTitle->getLocalUrl() ) );
+		$form .= wfElement( 'label', array( 'for' => 'namespace' ),
+			wfMsg( 'namespace' ) ) . ' ';
+		$form .= HtmlNamespaceSelector( $this->namespace );
+		# Preserve the offset and limit
+		$form .= wfElement( 'input', array(
+			'type' => 'hidden',
+			'name' => 'offset',
+			'value' => $this->offset ) );
+		$form .= wfElement( 'input', array(
+			'type' => 'hidden',
+			'name' => 'limit',
+			'value' => $this->limit ) );
+		$form .= wfElement( 'input', array(
+			'type' => 'submit',
+			'name' => 'submit',
+			'id' => 'submit',
+			'value' => wfMsg( 'allpagessubmit' ) ) );
+		$form .= wfCloseElement( 'form' );
+		return( $form );
+	}
+	
+	/**
+	 * Link parameters
+	 *
+	 * @return array
+	 */
+	function linkParameters() {
+		return( array( 'namespace' => $this->namespace ) );
+	}
+	
 }
 
 /**
@@ -111,10 +153,10 @@ class NewPagesPage extends QueryPage {
  */
 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 ) {
@@ -134,13 +176,17 @@ function wfSpecialNewpages($par, $specialPage) {
 				}
 			}
 		}
+	} else {
+		if( $ns = $wgRequest->getInt( 'namespace', 0 ) )
+			$namespace = $ns;
 	}
+	
 	if ( ! isset( $shownavigation ) )
 		$shownavigation = ! $specialPage->including();
 
 	$npp = new NewPagesPage( $namespace );
 
-	if ( ! $npp->doFeed( $wgRequest->getVal( 'feed' ) ) )
+	if ( ! $npp->doFeed( $wgRequest->getVal( 'feed' ), $limit ) )
 		$npp->doQuery( $offset, $limit, $shownavigation );
 }