X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialRecentchanges.php;h=60a04e00a4d20025e673e44279ef8ca1b712ab56;hb=f059e0952407f368a6fbcccefe57982c4d63ba2a;hp=812369417f90b7527a89740413ca1eb51cfc8353;hpb=fb2064aed1478e80b773d611b90dd40af286eabc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 812369417f..60a04e00a4 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -1,65 +1,63 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
  *
  */
-require_once( 'Feed.php' );
-require_once( 'ChangesList.php' );
-require_once( 'Revision.php' );
+require_once( dirname(__FILE__) . '/ChangesList.php' );
 
 /**
  * Constructor
  */
 function wfSpecialRecentchanges( $par, $specialPage ) {
-	global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
-	global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
-	global $wgFeedClasses, $wgUseRCPatrol;
+	global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
 	global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
-	global $wgLinkCache;
+	global $wgAllowCategorizedRecentChanges ;
 	$fname = 'wfSpecialRecentchanges';
 
 	# Get query parameters
 	$feedFormat = $wgRequest->getVal( 'feed' );
 
+	/* Checkbox values can't be true by default, because
+	 * we cannot differentiate between unset and not set at all
+	 */
 	$defaults = array(
 	/* int  */ 'days' => $wgUser->getDefaultOption('rcdays'),
 	/* int  */ 'limit' => $wgUser->getDefaultOption('rclimit'),
 	/* bool */ 'hideminor' => false,
 	/* bool */ 'hidebots' => true,
+	/* bool */ 'hideanons' => false,
 	/* bool */ 'hideliu' => false,
 	/* bool */ 'hidepatrolled' => false,
+	/* bool */ 'hidemyself' => false,
 	/* text */ 'from' => '',
 	/* text */ 'namespace' => null,
 	/* bool */ 'invert' => false,
+	/* bool */ 'categories_any' => false,
 	);
 
 	extract($defaults);
 
 
-	$days = $wgUser->getOption( 'rcdays' );
-	if ( !$days ) { $days = $defaults['days']; }
+	$days = $wgUser->getOption( 'rcdays', $defaults['days']);
 	$days = $wgRequest->getInt( 'days', $days );
 
-	$limit = $wgUser->getOption( 'rclimit' );
-	if ( !$limit ) { $limit = $defaults['limit']; }
+	$limit = $wgUser->getOption( 'rclimit', $defaults['limit'] );
 
 	#	list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
 	$limit = $wgRequest->getInt( 'limit', $limit );
 
 	/* order of selection: url > preferences > default */
 	$hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor') ? true : $defaults['hideminor'] );
-
-
+	
 	# As a feed, use limited settings only
 	if( $feedFormat ) {
 		global $wgFeedLimit;
 		if( $limit > $wgFeedLimit ) {
-			$options['limit'] = $wgFeedLimit;
+			$limit = $wgFeedLimit;
 		}
 
 	} else {
@@ -67,8 +65,10 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 		$namespace = $wgRequest->getIntOrNull( 'namespace' );
 		$invert = $wgRequest->getBool( 'invert', $defaults['invert'] );
 		$hidebots = $wgRequest->getBool( 'hidebots', $defaults['hidebots'] );
+		$hideanons = $wgRequest->getBool( 'hideanons', $defaults['hideanons'] );
 		$hideliu = $wgRequest->getBool( 'hideliu', $defaults['hideliu'] );
 		$hidepatrolled = $wgRequest->getBool( 'hidepatrolled', $defaults['hidepatrolled'] );
+		$hidemyself = $wgRequest->getBool ( 'hidemyself', $defaults['hidemyself'] );
 		$from = $wgRequest->getVal( 'from', $defaults['from'] );
 
 		# Get query parameters from path
@@ -81,11 +81,14 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 				if ( 'minor' == $bit ) $hideminor = 0;
 				if ( 'hideliu' == $bit ) $hideliu = 1;
 				if ( 'hidepatrolled' == $bit ) $hidepatrolled = 1;
+				if ( 'hideanons' == $bit ) $hideanons = 1;
+				if ( 'hidemyself' == $bit ) $hidemyself = 1;
 
 				if ( is_numeric( $bit ) ) {
 					$limit = $bit;
 				}
-
+				
+				$m = array();
 				if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) {
 					$limit = $m[1];
 				}
@@ -101,8 +104,8 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 
 
 	# Database connection and caching
-	$dbr =& wfGetDB( DB_SLAVE );
-	extract( $dbr->tableNames( 'recentchanges', 'watchlist' ) );
+	$dbr = wfGetDB( DB_SLAVE );
+	list( $recentchanges, $watchlist ) = $dbr->tableNamesN( 'recentchanges', 'watchlist' );
 
 
 	$cutoff_unixtime = time() - ( $days * 86400 );
@@ -127,10 +130,27 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 		}
 	}
 
-	$hidem  = $hideminor ? 'AND rc_minor=0' : '';
-	$hidem .= $hidebots ? ' AND rc_bot=0' : '';
-	$hidem .= $hideliu ? ' AND rc_user=0' : '';
-	$hidem .= $hidepatrolled ? ' AND rc_patrolled=0' : '';
+	# It makes no sense to hide both anons and logged-in users
+	# Where this occurs, force anons to be shown
+	if( $hideanons && $hideliu )
+		$hideanons = false;
+
+	# Form WHERE fragments for all the options
+	$hidem  = $hideminor ? 'AND rc_minor = 0' : '';
+	$hidem .= $hidebots ? ' AND rc_bot = 0' : '';
+	$hidem .= $hideliu ? ' AND rc_user = 0' : '';
+	$hidem .= ( $wgUseRCPatrol && $hidepatrolled ) ? ' AND rc_patrolled = 0' : '';
+	$hidem .= $hideanons ? ' AND rc_user != 0' : '';
+	
+	if( $hidemyself ) {
+		if( $wgUser->getID() ) {
+			$hidem .= ' AND rc_user != ' . $wgUser->getID();
+		} else {
+			$hidem .= ' AND rc_user_text != ' . $dbr->addQuotes( $wgUser->getName() );
+		}
+	}
+
+	# Namespace filtering
 	$hidem .= is_null( $namespace ) ?  '' : ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace;
 
 	// This is the big thing!
@@ -138,9 +158,10 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 	$uid = $wgUser->getID();
 
 	// Perform query
-	$sql2 = "SELECT * FROM $recentchanges " .
+	$forceclause = $dbr->useIndexClause("rc_timestamp");
+	$sql2 = "SELECT * FROM $recentchanges $forceclause".
 	  ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
-	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
+	  "WHERE rc_timestamp >= '{$cutoff}' {$hidem} " .
 	  "ORDER BY rc_timestamp DESC";
 	$sql2 = $dbr->limitResult($sql2, $limit, 0);
 	$res = $dbr->query( $sql2, $fname );
@@ -150,56 +171,68 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 	$batch = new LinkBatch;
 	while( $row = $dbr->fetchObject( $res ) ){
 		$rows[] = $row;
-		// User page link
-		$title = Title::makeTitleSafe( NS_USER, $row->rc_user_text );
-		$batch->addObj( $title );
-
-		// User talk
-		$title = Title::makeTitleSafe( NS_USER_TALK, $row->rc_user_text );
-		$batch->addObj( $title );
+		if ( !$feedFormat ) {
+			// User page and talk links
+			$batch->add( NS_USER, $row->rc_user_text  );
+			$batch->add( NS_USER_TALK, $row->rc_user_text  );
+		}
 
 	}
 	$dbr->freeResult( $res );
 
-	// Run existence checks
-	$batch->execute( $wgLinkCache );
-
 	if( $feedFormat ) {
 		rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod );
 	} else {
 
 		# Web output...
 
+		// Run existence checks
+		$batch->execute();
+		$any = $wgRequest->getBool( 'categories_any', $defaults['categories_any']);
+
 		// Output header
 		if ( !$specialPage->including() ) {
-			$wgOut->addWikiText( wfMsgForContent( "recentchangestext" ) );
+			$wgOut->addWikiText( wfMsgForContentNoTrans( "recentchangestext" ) );
 
 			// Dump everything here
 			$nondefaults = array();
-		
+
 			wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'limit', $limit , $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'hideminor', $hideminor, $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'hidebots', $hidebots, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'hideanons', $hideanons, $defaults, $nondefaults );
 			wfAppendToArrayIfNotDefault( 'hideliu', $hideliu, $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'hidepatrolled', $hidepatrolled, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'hidemyself', $hidemyself, $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'from', $from, $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'namespace', $namespace, $defaults, $nondefaults);
 			wfAppendToArrayIfNotDefault( 'invert', $invert, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'categories_any', $any, $defaults, $nondefaults);
 
 			// Add end of the texts
 			$wgOut->addHTML( '<div class="rcoptions">' . rcOptionsPanel( $defaults, $nondefaults ) . "\n" );
-			$wgOut->addHTML( rcNamespaceForm( $namespace, $invert, $nondefaults) . '</div>'."\n");
+			$wgOut->addHTML( rcNamespaceForm( $namespace, $invert, $nondefaults, $any ) . '</div>'."\n");
 		}
 
 		// And now for the content
-		$sk = $wgUser->getSkin();
 		$wgOut->setSyndicated( true );
-
+		
 		$list = ChangesList::newFromUser( $wgUser );
+		
+		if ( $wgAllowCategorizedRecentChanges ) {
+			$categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ;
+			$categories = str_replace ( "|" , "\n" , $categories ) ;
+			$categories = explode ( "\n" , $categories ) ;
+			rcFilterByCategories ( $rows , $categories , $any ) ;
+		}
 
 		$s = $list->beginRecentChangesList();
 		$counter = 1;
+
+		$showWatcherCount = $wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' );
+		$watcherCache = array();
+
 		foreach( $rows as $obj ){
 			if( $limit == 0) {
 				break;
@@ -218,13 +251,19 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 					$rc->notificationtimestamp = false;
 				}
 
-				if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
-					$sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" . $dbr->strencode($obj->rc_title) ."' AND wl_namespace=$obj->rc_namespace" ;
-					$res3 = $dbr->query( $sql3, 'wfSpecialRecentChanges');
-					$x = $dbr->fetchObject( $res3 );
-					$rc->numberofWatchingusers = $x->n;
-				} else {
-					$rc->numberofWatchingusers = 0;
+				$rc->numberofWatchingusers = 0; // Default
+				if ($showWatcherCount && $obj->rc_namespace >= 0) {
+					if (!isset($watcherCache[$obj->rc_namespace][$obj->rc_title])) {
+						$watcherCache[$obj->rc_namespace][$obj->rc_title] =
+						 	$dbr->selectField( 'watchlist',
+								'COUNT(*)',
+								array(
+									'wl_namespace' => $obj->rc_namespace,
+									'wl_title' => $obj->rc_title,
+								),
+								__METHOD__ . '-watchers' );
+					}
+					$rc->numberofWatchingusers = $watcherCache[$obj->rc_namespace][$obj->rc_title];
 				}
 				$s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
 				--$limit;
@@ -235,8 +274,57 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 	}
 }
 
+function rcFilterByCategories ( &$rows , $categories , $any ) {
+	if( empty( $categories ) ) {
+		return;
+	}
+	
+	# Filter categories
+	$cats = array () ;
+	foreach ( $categories AS $cat ) {
+		$cat = trim ( $cat ) ;
+		if ( $cat == "" ) continue ;
+		$cats[] = $cat ;
+	}
+	
+	# Filter articles
+	$articles = array () ;
+	$a2r = array () ;
+	foreach ( $rows AS $k => $r ) {
+		$nt = Title::makeTitle( $r->rc_title , $r->rc_namespace );
+		$id = $nt->getArticleID() ;
+		if ( $id == 0 ) continue ; # Page might have been deleted...
+		if ( !in_array ( $id , $articles ) ) {
+			$articles[] = $id ;
+		}
+		if ( !isset ( $a2r[$id] ) ) {
+			$a2r[$id] = array() ;
+		}
+		$a2r[$id][] = $k ;
+	}
+	
+	# Shortcut?
+	if ( count ( $articles ) == 0 OR count ( $cats ) == 0 )
+		return ;
+	
+	# Look up
+	$c = new Categoryfinder ;
+	$c->seed ( $articles , $cats , $any ? "OR" : "AND" ) ;
+	$match = $c->run () ;
+	
+	# Filter
+	$newrows = array () ;
+	foreach ( $match AS $id ) {
+		foreach ( $a2r[$id] AS $rev ) {
+			$k = $rev ;
+			$newrows[$k] = $rows[$k] ;
+		}
+	}
+	$rows = $newrows ;
+}
+
 function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
-	global $messageMemc, $wgDBname, $wgFeedCacheTimeout;
+	global $messageMemc, $wgFeedCacheTimeout;
 	global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
 
 	if( !isset( $wgFeedClasses[$feedFormat] ) ) {
@@ -244,16 +332,24 @@ function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
 		return false;
 	}
 
-	$timekey = "$wgDBname:rcfeed:$feedFormat:timestamp";
-	$key = "$wgDBname:rcfeed:$feedFormat:limit:$limit:minor:$hideminor";
+	$timekey = wfMemcKey( 'rcfeed', $feedFormat, 'timestamp' );
+	$key = wfMemcKey( 'rcfeed', $feedFormat, 'limit', $limit, 'minor', $hideminor );
 
 	$feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchanges' ) .
 		' [' . $wgContLanguageCode . ']';
 	$feed = new $wgFeedClasses[$feedFormat](
 		$feedTitle,
-		htmlspecialchars( wfMsgForContent( 'recentchangestext' ) ),
+		htmlspecialchars( wfMsgForContent( 'recentchanges-feed-description' ) ),
 		$wgTitle->getFullUrl() );
 
+	//purge cache if requested
+	global $wgRequest, $wgUser;
+	$purge = $wgRequest->getVal( 'action' ) == 'purge';
+	if ( $purge && $wgUser->isAllowed('purge') ) {
+		$messageMemc->delete( $timekey );
+		$messageMemc->delete( $key );
+	}
+
 	/**
 	 * Bumping around loading up diffs can be pretty slow, so where
 	 * possible we want to cache the feed output so the next visitor
@@ -295,8 +391,12 @@ function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
 	return true;
 }
 
+/**
+ * @todo document
+ * @param $rows Database resource with recentchanges rows
+ */
 function rcDoOutputFeed( $rows, &$feed ) {
-	global $wgSitename, $wgFeedClasses, $wgContLanguageCode;
+	wfProfileIn( __METHOD__ );
 
 	$feed->outHeader();
 
@@ -313,7 +413,6 @@ function rcDoOutputFeed( $rows, &$feed ) {
 			$sorted[$n] = $obj;
 			$n++;
 		}
-		$first = false;
 	}
 
 	foreach( $sorted as $obj ) {
@@ -322,7 +421,7 @@ function rcDoOutputFeed( $rows, &$feed ) {
 		$item = new FeedItem(
 			$title->getPrefixedText(),
 			rcFormatDiff( $obj ),
-			$title->getFullURL(),
+			$title->getFullURL( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ),
 			$obj->rc_timestamp,
 			$obj->rc_user_text,
 			$talkpage->getFullURL()
@@ -330,6 +429,7 @@ function rcDoOutputFeed( $rows, &$feed ) {
 		$feed->outItem( $item );
 	}
 	$feed->outFooter();
+	wfProfileOut( __METHOD__ );
 }
 
 /**
@@ -360,7 +460,7 @@ function rcDaysLink( $lim, $d, $page='Recentchanges', $more='' ) {
  * Used by Recentchangeslinked
  */
 function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall = false, $minorLink = '',
-	$botLink = '', $liuLink = '', $patrLink = '' ) {
+	$botLink = '', $liuLink = '', $patrLink = '', $myselfLink = '' ) {
 	if ($more != '') $more .= '&';
 	$cl = rcCountLink( 50, $days, $page, $more ) . ' | ' .
 	  rcCountLink( 100, $days, $page, $more  ) . ' | ' .
@@ -373,7 +473,14 @@ function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall
 	  rcDaysLink( $limit, 14, $page, $more  ) . ' | ' .
 	  rcDaysLink( $limit, 30, $page, $more  ) .
 	  ( $doall ? ( ' | ' . rcDaysLink( $limit, 0, $page, $more ) ) : '' );
-	$shm = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink );
+	
+	$linkParts = array( 'minorLink' => 'minor', 'botLink' => 'bots', 'liuLink' => 'liu', 'patrLink' => 'patr', 'myselfLink' => 'mine' );
+	foreach( $linkParts as $linkVar => $linkMsg ) {
+		if( $$linkVar != '' )
+			$links[] = wfMsgHtml( 'rcshowhide' . $linkMsg, $$linkVar );
+	}
+	
+	$shm = implode( ' | ', $links );
 	$note = wfMsg( 'rclinks', $cl, $dl, $shm );
 	return $note;
 }
@@ -381,46 +488,53 @@ function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall
 
 /**
  * Makes change an option link which carries all the other options
+ * @param $title see Title
+ * @param $override
+ * @param $options
  */
 function makeOptionsLink( $title, $override, $options ) {
-	global $wgUser, $wgLang, $wgContLang;
+	global $wgUser, $wgContLang;
 	$sk = $wgUser->getSkin();
 	return $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
-		$title, wfArrayToCGI( $override, $options ) );
+		htmlspecialchars( $title ), wfArrayToCGI( $override, $options ) );
 }
 
 /**
- * Creates the options panel
+ * Creates the options panel.
+ * @param $defaults
+ * @param $nondefaults
  */
 function rcOptionsPanel( $defaults, $nondefaults ) {
-	global $wgLang;
+	global $wgLang, $wgUseRCPatrol;
 
 	$options = $nondefaults + $defaults;
 
 	if( $options['from'] )
-		$note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $options['limit'] ), $wgLang->timeanddate( $options['from'], true ) );
+		$note = wfMsgExt( 'rcnotefrom', array( 'parseinline' ),
+			$wgLang->formatNum( $options['limit'] ),
+			$wgLang->timeanddate( $options['from'], true ) );
 	else
-		$note = wfMsg( 'rcnote', $wgLang->formatNum( $options['limit'] ), $wgLang->formatNum( $options['days'] ) );
+		$note = wfMsgExt( 'rcnote', array( 'parseinline' ),
+			$wgLang->formatNum( $options['limit'] ),
+			$wgLang->formatNum( $options['days'] ),
+			$wgLang->timeAndDate( wfTimestampNow(), true ) );
 
 	// limit links
-	$cl = '';
 	$options_limit = array(50, 100, 250, 500);
-	$i = 0;
-	while ( $i+1 < count($options_limit) ) {
-		$cl .=  makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) . ' | ' ;
-		$i++;
+	foreach( $options_limit as $value ) {
+		$cl[] = makeOptionsLink( $wgLang->formatNum( $value ),
+			array( 'limit' => $value ), $nondefaults) ;
 	}
-	$cl .=  makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) ;
+	$cl = implode( ' | ', $cl);
 
 	// day links, reset 'from' to none
-	$dl = '';
 	$options_days = array(1, 3, 7, 14, 30);
-	$i = 0;
-	while ( $i+1 < count($options_days) ) {
-		$dl .=  makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) . ' | ' ;
-		$i++;
+	foreach( $options_days as $value ) {
+		$dl[] = makeOptionsLink( $wgLang->formatNum( $value ),
+			array( 'days' => $value, 'from' => ''  ), $nondefaults) ;
 	}
-	$dl .=  makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) ;
+	$dl = implode( ' | ', $dl);
+
 
 	// show/hide links
 	$showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ));
@@ -428,55 +542,82 @@ function rcOptionsPanel( $defaults, $nondefaults ) {
 		array( 'hideminor' => 1-$options['hideminor'] ), $nondefaults);
 	$botLink = makeOptionsLink( $showhide[1-$options['hidebots']],
 		array( 'hidebots' => 1-$options['hidebots'] ), $nondefaults);
+	$anonsLink = makeOptionsLink( $showhide[ 1 - $options['hideanons'] ],
+		array( 'hideanons' => 1 - $options['hideanons'] ), $nondefaults );
 	$liuLink   = makeOptionsLink( $showhide[1-$options['hideliu']],
 		array( 'hideliu' => 1-$options['hideliu'] ), $nondefaults);
 	$patrLink  = makeOptionsLink( $showhide[1-$options['hidepatrolled']],
 		array( 'hidepatrolled' => 1-$options['hidepatrolled'] ), $nondefaults);
-
-	$hl = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink );
-
+	$myselfLink = makeOptionsLink( $showhide[1-$options['hidemyself']],
+		array( 'hidemyself' => 1-$options['hidemyself'] ), $nondefaults);
+		
+	$links[] = wfMsgHtml( 'rcshowhideminor', $minorLink );
+	$links[] = wfMsgHtml( 'rcshowhidebots', $botLink );
+	$links[] = wfMsgHtml( 'rcshowhideanons', $anonsLink );
+	$links[] = wfMsgHtml( 'rcshowhideliu', $liuLink );
+	if( $wgUseRCPatrol )
+		$links[] = wfMsgHtml( 'rcshowhidepatr', $patrLink );
+	$links[] = wfMsgHtml( 'rcshowhidemine', $myselfLink );
+	$hl = implode( ' | ', $links );
+		
 	// show from this onward link
 	$now = $wgLang->timeanddate( wfTimestampNow(), true );
 	$tl =  makeOptionsLink( $now, array( 'from' => wfTimestampNow()), $nondefaults );
 
-	$rclinks = wfMsg( 'rclinks', $cl, $dl, $hl );
-	$rclistfrom = wfMsg( 'rclistfrom', $tl );
+	$rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter'),
+		$cl, $dl, $hl );
+	$rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter'), $tl );
 	return "$note<br />$rclinks<br />$rclistfrom";
 
 }
 
-/**<F2>
+/**
  * Creates the choose namespace selection
  *
- * @access private
+ * @private
  *
- * @param mixed $namespace The key of the currently selected namespace, empty string
+ * @param $namespace Mixed: the key of the currently selected namespace, empty string
  *              if there is none
- * @param bool $invert Whether to invert the namespace selection
- * @param array $nondefaults An array of non default options to be remembered
+ * @param $invert Bool: whether to invert the namespace selection
+ * @param $nondefaults Array: an array of non default options to be remembered
+ * @param $categories_any Bool: Default value for the checkbox
  *
  * @return string
  */
-function rcNamespaceForm ( $namespace, $invert, $nondefaults ) {
-	global $wgContLang, $wgScript;
-	$t = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
+function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
+	global $wgScript, $wgAllowCategorizedRecentChanges, $wgRequest;
+	$t = SpecialPage::getTitleFor( 'Recentchanges' );
 
 	$namespaceselect = HTMLnamespaceselector($namespace, '');
 	$submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
 	$invertbox = "<input type='checkbox' name='invert' value='1' id='nsinvert'" . ( $invert ? ' checked="checked"' : '' ) . ' />';
-
+	
+	if ( $wgAllowCategorizedRecentChanges ) {
+		$categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ;
+		$cb_arr = array( 'type' => 'checkbox', 'name' => 'categories_any', 'value' => "1" ) ;
+		if ( $categories_any ) $cb_arr['checked'] = "checked" ;
+		$catbox = "<br />" ;
+		$catbox .= wfMsgExt('rc_categories', array('parseinline')) . " ";
+		$catbox .= wfElement('input', array( 'type' => 'text', 'name' => 'categories', 'value' => $categories));
+		$catbox .= " &nbsp;" ;
+		$catbox .= wfElement('input', $cb_arr );
+		$catbox .= wfMsgExt('rc_categories_any', array('parseinline'));
+	} else {
+		$catbox = "" ;
+	}
+	
 	$out = "<div class='namespacesettings'><form method='get' action='{$wgScript}'>\n";
 
 	foreach ( $nondefaults as $key => $value ) {
 		if ($key != 'namespace' && $key != 'invert')
 			$out .= wfElement('input', array( 'type' => 'hidden', 'name' => $key, 'value' => $value));
 	}
-	
+
 	$out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
 	$out .= "
 <div id='nsselect' class='recentchanges'>
 	<label for='namespace'>" . wfMsgHtml('namespace') . "</label>
-	{$namespaceselect}{$submitbutton}{$invertbox} <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>\n</div>";
+	{$namespaceselect}{$submitbutton}{$invertbox} <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>{$catbox}\n</div>";
 	$out .= '</form></div>';
 	return $out;
 }
@@ -486,71 +627,104 @@ function rcNamespaceForm ( $namespace, $invert, $nondefaults ) {
  * Format a diff for the newsfeed
  */
 function rcFormatDiff( $row ) {
+	$titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
+	$timestamp = wfTimestamp( TS_MW, $row->rc_timestamp );
+	return rcFormatDiffRow( $titleObj,
+		$row->rc_last_oldid, $row->rc_this_oldid,
+		$timestamp,
+		$row->rc_comment );
+}
+
+function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment ) {
+	global $wgFeedDiffCutoff, $wgContLang, $wgUser;
 	$fname = 'rcFormatDiff';
 	wfProfileIn( $fname );
 
-	require_once( 'DifferenceEngine.php' );
-	$comment = '<p>' . htmlspecialchars( $row->rc_comment ) . "</p>\n";
+	$skin = $wgUser->getSkin();
+	$completeText = '<p>' . $skin->formatComment( $comment ) . "</p>\n";
 
-	if( $row->rc_namespace >= 0 ) {
-		global $wgContLang;
+	//NOTE: Check permissions for anonymous users, not current user.
+	//      No "privileged" version should end up in the cache.
+	//      Most feed readers will not log in anway.
+	$anon = new User();
+	$accErrors = $title->getUserPermissionsErrors( 'read', $anon, true );
 
-		#$diff =& new DifferenceEngine( $row->rc_this_oldid, $row->rc_last_oldid, $row->rc_id );
-		#$diff->showDiffPage();
-
-		$titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
-		$dbr =& wfGetDB( DB_SLAVE );
-		$newrev = Revision::newFromTitle( $titleObj, $row->rc_this_oldid );
-		if( $newrev ) {
-			$newtext = $newrev->getText();
-		} else {
-			$diffText = "<p>Can't load revision $row->rc_this_oldid</p>";
-			wfProfileOut( $fname );
-			return $comment . $diffText;
-		}
-
-		if( $row->rc_last_oldid ) {
+	if( $title->getNamespace() >= 0 && !$accErrors ) {
+		if( $oldid ) {
 			wfProfileIn( "$fname-dodiff" );
-			$oldrev =& Revision::newFromId( $row->rc_last_oldid );
-			if( !$oldrev ) {
-				$diffText = "<p>Can't load old revision $row->rc_last_oldid</p>";
-				wfProfileOut( $fname );
-				return $comment . $diffText;
-			}
-			$oldtext = $oldrev->getText();
-
-			# Old entries may contain illegal characters
-			# which will damage output
-			$oldtext = UtfNormal::cleanUp( $oldtext );
-
-			global $wgFeedDiffCutoff;
-			if( strlen( $newtext ) > $wgFeedDiffCutoff ||
-				strlen( $oldtext ) > $wgFeedDiffCutoff ) {
-				$diffLink = $titleObj->escapeFullUrl(
-					'diff=' . $row->rc_this_oldid .
-					'&oldid=' . $row->rc_last_oldid );
+
+			$de = new DifferenceEngine( $title, $oldid, $newid );
+			#$diffText = $de->getDiff( wfMsg( 'revisionasof',
+			#	$wgContLang->timeanddate( $timestamp ) ),
+			#	wfMsg( 'currentrev' ) );
+			$diffText = $de->getDiff(
+				wfMsg( 'previousrevision' ), // hack
+				wfMsg( 'revisionasof',
+					$wgContLang->timeanddate( $timestamp ) ) );
+				
+
+			if ( strlen( $diffText ) > $wgFeedDiffCutoff ) {
+				// Omit large diffs
+				$diffLink = $title->escapeFullUrl(
+					'diff=' . $newid .
+					'&oldid=' . $oldid );
 				$diffText = '<a href="' .
 					$diffLink .
 					'">' .
 					htmlspecialchars( wfMsgForContent( 'difference' ) ) .
 					'</a>';
+			} elseif ( $diffText === false ) {
+				// Error in diff engine, probably a missing revision
+				$diffText = "<p>Can't load revision $newid</p>";
 			} else {
-				$diffText = DifferenceEngine::getDiff( $oldtext, $newtext,
-				  wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
-				  wfMsg( 'currentrev' ) );
+				// Diff output fine, clean up any illegal UTF-8
+				$diffText = UtfNormal::cleanUp( $diffText );
+				$diffText = rcApplyDiffStyle( $diffText );
 			}
 			wfProfileOut( "$fname-dodiff" );
 		} else {
+			$rev = Revision::newFromId( $newid );
+			if( is_null( $rev ) ) {
+				$newtext = '';
+			} else {
+				$newtext = $rev->getText();
+			}
 			$diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
 				'<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
 		}
-
-		wfProfileOut( $fname );
-		return $comment . $diffText;
+		$completeText .= $diffText;
 	}
 
 	wfProfileOut( $fname );
-	return $comment;
+	return $completeText;
+}
+
+/**
+ * Hacky application of diff styles for the feeds.
+ * Might be 'cleaner' to use DOM or XSLT or something,
+ * but *gack* it's a pain in the ass.
+ *
+ * @param $text String:
+ * @return string
+ * @private
+ */
+function rcApplyDiffStyle( $text ) {
+	$styles = array(
+		'diff'             => 'background-color: white; color:black;',
+		'diff-otitle'      => 'background-color: white; color:black;',
+		'diff-ntitle'      => 'background-color: white; color:black;',
+		'diff-addedline'   => 'background: #cfc; color:black; font-size: smaller;',
+		'diff-deletedline' => 'background: #ffa; color:black; font-size: smaller;',
+		'diff-context'     => 'background: #eee; color:black; font-size: smaller;',
+		'diffchange'       => 'color: red; font-weight: bold; text-decoration: none;',
+	);
+	
+	foreach( $styles as $class => $style ) {
+		$text = preg_replace( "/(<[^>]+)class=(['\"])$class\\2([^>]*>)/",
+			"\\1style=\"$style\"\\3", $text );
+	}
+	
+	return $text;
 }
 
-?>
+