X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSpecialNewpages.php;h=b388533d419be7fa77683427e2298e432d711cff;hb=f10d65f0a3b716b7cc90f4aacec388e21f8ef644;hp=9367a5ee4e1e33e40056613222bd3a3003f440de;hpb=64ac6b8e775dd8582ea9cc5f24235488f076c5b3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index 9367a5ee4e..b388533d41 100644
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once( "QueryPage.php" );
+require_once( 'QueryPage.php' );
 
 /**
  *
@@ -16,20 +16,24 @@ 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() {
 		global $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
-		$usepatrol = ( $wgUseRCPatrol && $wgUser->getID() != 0 &&
+		$usepatrol = ( $wgUseRCPatrol && $wgUser->isLoggedIn() &&
 		               ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
 		$dbr =& wfGetDB( DB_SLAVE );
 		extract( $dbr->tableNames( 'recentchanges', 'page', 'text' ) );
@@ -39,20 +43,20 @@ class NewPagesPage extends QueryPage {
 			"SELECT 'Newpages' as type,
 			        rc_namespace AS namespace,
 			        rc_title AS title,
-			        rc_cur_id AS value,
+			        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,
-			        length(old_text) as length,
-			        old_text as text
-			FROM $recentchanges,$page,$text
+			        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=0 AND page_is_redirect=0
-			  AND page_latest=old_id";
+			AND rc_namespace=" . $this->namespace . " AND page_is_redirect=0";
 	}
 
 	function formatResult( $skin, $result ) {
@@ -60,50 +64,84 @@ class NewPagesPage extends QueryPage {
 		$u = $result->user;
 		$ut = $result->user_text;
 
-		$length = wfMsg( "nbytes", $wgLang->formatNum( $result->length ) );
-		$c = $skin->formatComment($result->comment );
+		$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->getID() != 0 &&
+		     $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}";
 
-		if ( "" != $c && "*" != $c ) {
-			$s .= " <em>({$c})</em>";
-		}
+		$s .= $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>" .
+					nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";
+			}
+		}
+		return parent::feedItemDesc( $row );
+	}
 }
 
 /**
  * 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 );
 }
 
 ?>