This commit was manufactured by cvs2svn to create tag 'REL1_5_5'.1.5.5

1 files changed, 88 insertions, 75 deletions

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index e6fabf80fa26..c0accdaaae37 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -22,7 +22,7 @@ function wfSpecialWatchlist( $par ) {
 	$fname = 'wfSpecialWatchlist';
 
 	$wgOut->setPagetitle( wfMsg( 'watchlist' ) );
-	$sub = wfMsg( 'watchlistsub', $wgUser->getName() );
+	$sub = htmlspecialchars( wfMsg( 'watchlistsub', $wgUser->getName() ) );
 	$wgOut->setSubtitle( $sub );
 	$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
@@ -33,11 +33,20 @@ function wfSpecialWatchlist( $par ) {
 		return;
 	}
 
+	$defaults = array(
+	/* float */ 'days' => 3.0, /* or 0.5, watch further below */
+	/* bool  */ 'hideOwn' => false,
+	);
+
+	extract($defaults);
+
 	# Get query variables
 	$days = $wgRequest->getVal( 'days' );
+	$hideOwn = $wgRequest->getBool( 'hideOwn' );
+
+	# Watchlist editing
 	$action = $wgRequest->getVal( 'action' );
 	$remove = $wgRequest->getVal( 'remove' );
-	$hideOwn = $wgRequest->getBool( 'hideOwn' );	
 	$id = $wgRequest->getArray( 'id' );
 
 	$uid = $wgUser->getID();
@@ -45,7 +54,7 @@ function wfSpecialWatchlist( $par ) {
 		$wgUser->clearAllNotifications( $uid );
 	}
 
-
+  # Deleting items from watchlist
 	if(($action == 'submit') && isset($remove) && is_array($id)) {
 		$wgOut->addWikiText( wfMsg( 'removingchecked' ) );
 		$wgOut->addHTML( '<p>' );
@@ -78,32 +87,38 @@ function wfSpecialWatchlist( $par ) {
 	$dbr =& wfGetDB( DB_SLAVE );
 	extract( $dbr->tableNames( 'page', 'revision', 'watchlist', 'recentchanges' ) );
 
-	$sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
-	$res = $dbr->query( $sql, $fname );
-	$s = $dbr->fetchObject( $res );
+               	$sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
+        	$res = $dbr->query( $sql, $fname );
+        	$s = $dbr->fetchObject( $res );
 
-#	Patch *** A1 *** (see A2 below)
+        #	Patch *** A1 *** (see A2 below)
 #	adjust for page X, talk:page X, which are both stored separately, but treated together
-#	$nitems = $s->n / 2;
-	$nitems = $s->n;
+	$nitems = floor($s->n / 2);
+#	$nitems = $s->n;
 
 	if($nitems == 0) {
 		$wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
 		return;
 	}
 
-	if ( is_null( $days ) ) {
-		$big = 1000;
+	if( is_null($days) || !is_numeric($days) ) {
+		$big = 1000; /* The magical big */
 		if($nitems > $big) {
 			# Set default cutoff shorter
-			$days = (12.0 / 24.0); # 12 hours...
+			$days = $defaults['days'] = (12.0 / 24.0); # 12 hours...
 		} else {
-			$days = 3; # longer cutoff for shortlisters
+			$days = $defaults['days']; # default cutoff for shortlisters
 		}
 	} else {
 		$days = floatval($days);
 	}
 
+	// Dump everything here
+	$nondefaults = array();
+
+	wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
+	wfAppendToArrayIfNotDefault( 'hideOwn', $hideOwn, $defaults, $nondefaults);
+
 	if ( $days <= 0 ) {
 		$docutoff = '';
 		$cutoff = false;
@@ -112,13 +127,17 @@ function wfSpecialWatchlist( $par ) {
 	        $docutoff = "AND rev_timestamp > '" .
 		  ( $cutoff = $dbr->timestamp( time() - intval( $days * 86400 ) ) )
 		  . "'";
-	        $sql = "SELECT COUNT(*) AS n FROM $page, $revision  WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
-		$res = $dbr->query( $sql, $fname );
-		$s = $dbr->fetchObject( $res );
-		$npages = $s->n;
+                  /* 
+                  $sql = "SELECT COUNT(*) AS n FROM $page, $revision  WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
+                  $res = $dbr->query( $sql, $fname );
+                  $s = $dbr->fetchObject( $res );
+                  $npages = $s->n;
+                  */
+                  $npages = 40000 * $days;
 
 	}
 
+	/* Edit watchlist form */
 	if($wgRequest->getBool('edit') || $par == 'edit' ) {
 		$wgOut->addWikiText( wfMsg( 'watchlistcontains', $wgLang->formatNum( $nitems ) ) .
 			"\n\n" . wfMsg( 'watcheditlist' ) );
@@ -139,12 +158,12 @@ function wfSpecialWatchlist( $par ) {
 		while( $s = $dbr->fetchObject( $res ) ) {
 			$list[$s->wl_namespace][] = $s->wl_title;
 		}
-		
+
 		// TODO: Display a TOC
 		foreach($list as $ns => $titles) {
 			if (Namespace::isTalk($ns))
 				continue;
-			if ($ns != NS_MAIN) 
+			if ($ns != NS_MAIN)
 				$wgOut->addHTML( '<h2>' . $wgContLang->getFormattedNsText( $ns ) . '</h2>' );
 			$wgOut->addHTML( '<ul>' );
 			foreach($titles as $title) {
@@ -181,23 +200,8 @@ function wfSpecialWatchlist( $par ) {
 	# through the time-sorted page list checking for watched items.
 
 	# Up estimate of watched items by 15% to compensate for talk pages...
-	if( $cutoff && ( $nitems*1.15 > $npages ) ) {
-		$x = 'rev_timestamp';
-		$y = wfMsg( 'watchmethod-recent' );
-		# TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
-		# The change results in talk-pages not automatically included in watchlists, when their parent page is included
-		# $z = "wl_namespace=cur_namespace & ~1";
-		$z = 'wl_namespace=page_namespace';
-	} else {
-		$x = 'page_timestamp';
-		$y = wfMsg( 'watchmethod-list' );
-		# TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
-		# The change results in talk-pages not automatically included in watchlists, when their parent page is included
-		# $z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
-		$z = 'wl_namespace=page_namespace';
-	}
 
-	$andHideOwn = $hideOwn ? "AND (rev_user <> $uid)" : '';
+	$andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
 
 	# Show watchlist header
 	$header = '';
@@ -208,8 +212,9 @@ function wfSpecialWatchlist( $par ) {
 		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
 	}
 
-	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems / 2 ), 
-		$wgLang->formatNum( $npages ), $y,
+	# TODO: Consider removing the third parameter
+	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems ), 
+		$wgLang->formatNum( $npages ), '',
 		$specialTitle->getFullUrl( 'edit=yes' ) );
 	$wgOut->addWikiText( $header );
 	
@@ -222,53 +227,63 @@ function wfSpecialWatchlist( $par ) {
 			"\n\n" );
 	}
 
-	$use_index = $dbr->useIndexClause( $x );
-	$sql = "SELECT
-  page_namespace,page_title,rev_comment, page_id,
-  rev_user,rev_user_text,rev_timestamp,rev_minor_edit,rev_id,page_is_new,wl_notificationtimestamp
-  FROM $watchlist,$page,$revision  $use_index
-  WHERE wl_user=$uid
-  $andHideOwn
-  AND $z
-  AND wl_title=page_title
-  AND page_latest=rev_id
-  $docutoff
-  ORDER BY rev_timestamp DESC";
-
+        $sql = "SELECT
+          rc_namespace page_namespace,rc_title page_title,
+          rc_comment rev_comment, rc_cur_id page_id,
+          rc_user rev_user,rc_user_text rev_user_text,
+          rc_timestamp rev_timestamp,rc_minor rev_minor_edit,
+          rc_this_oldid rev_id,
+          rc_last_oldid,
+          rc_new page_is_new,wl_notificationtimestamp
+          FROM $watchlist,$recentchanges,$page
+          WHERE wl_user=$uid
+          AND wl_namespace=rc_namespace
+          AND wl_title=rc_title
+          AND rc_timestamp > '$cutoff'
+          AND rc_cur_id=page_id
+          AND rc_this_oldid=page_latest
+          $andHideOwn
+          ORDER BY rc_timestamp DESC";
 
 	$res = $dbr->query( $sql, $fname );
 	$numRows = $dbr->numRows( $res );
+
+	/* Start bottom header */
+	$wgOut->addHTML( "<hr />\n<p>" );
+
 	if($days >= 1)
-		$note = wfMsg( 'rcnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( $days ) );
+		$wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ),
+			$wgLang->formatNum( $days ) ) . '<br />' , false );
 	elseif($days > 0)
-		$note = wfMsg( 'wlnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( round($days*24) ) );
-	else
-		$note = '';
-	$wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
-	$note = wlCutoffLinks( $days );
-	$wgOut->addHTML( "{$note}\n" );
+		$wgOut->addWikiText( wfMsg( 'wlnote', $wgLang->formatNum( $numRows ),
+			$wgLang->formatNum( round($days*24) ) ) . '<br />' , false );
+
+	$wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" );
 	
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
 		$wgContLang->specialPage( 'Watchlist' ),
-		(0 == $hideOwn) ? wfMsg( 'wlhide' ) : wfMsg( 'wlshow' ),	
-	  	'hideOwn=' . $wgLang->formatNum( 1-$hideOwn ) );
-	  	
-	$note = wfMsg( "wlhideshowown", $s );
-	$wgOut->addHTML( "\n<br />{$note}\n<br />" );
+		(0 == $hideOwn) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
+		wfArrayToCGI( array('hideOwn' => 1-$hideOwn ), $nondefaults ) );
+
+	$wgOut->addHTML( wfMsgHtml( "wlhideshowown", $s ) );
 	
 	if ( $numRows == 0 ) {
-		$wgOut->addHTML( '<p><i>' . wfMsg( 'watchnochange' ) . '</i></p>' );
+		$wgOut->addWikitext( "<br />" . wfMsg( 'watchnochange' ), false );
+		$wgOut->addHTML( "</p>\n" );
 		return;
 	}
 
+	$wgOut->addHTML( "</p>\n" );
+	/* End bottom header */
+
 	$sk = $wgUser->getSkin();
 	$list =& new ChangesList( $sk );
 	$s = $list->beginRecentChangesList();
 	$counter = 1;
 	while ( $obj = $dbr->fetchObject( $res ) ) {
 		# Make fake RC entry
-		$rc = RecentChange::newFromCurRow( $obj );
+		$rc = RecentChange::newFromCurRow( $obj, $obj->rc_last_oldid );
 		$rc->counter = $counter++;
 
 		if ( $wgShowUpdatedMarker ) {
@@ -300,44 +315,42 @@ function wfSpecialWatchlist( $par ) {
 
 }
 
-
-function wlHoursLink( $h, $page ) {
+function wlHoursLink( $h, $page, $options = array() ) {
 	global $wgUser, $wgLang, $wgContLang;
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
 	  $wgContLang->specialPage( $page ),
 	  $wgLang->formatNum( $h ),
-	  'days=' . ($h / 24.0) );
+	  wfArrayToCGI( array('days' => ($h / 24.0)), $options ) );
 	return $s;
 }
 
-
-function wlDaysLink( $d, $page ) {
+function wlDaysLink( $d, $page, $options = array() ) {
 	global $wgUser, $wgLang, $wgContLang;
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
 	  $wgContLang->specialPage( $page ),
-	  ($d ? $wgLang->formatNum( $d ) : wfMsg( 'watchlistall2' ) ), "days=$d" );
+	  ($d ? $wgLang->formatNum( $d ) : wfMsgHtml( 'watchlistall2' ) ),
+	  wfArrayToCGI( array('days' => $d), $options ) );
 	return $s;
 }
 
-function wlCutoffLinks( $days, $page = 'Watchlist' )
-{
+function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
 	$hours = array( 1, 2, 6, 12 );
 	$days = array( 1, 3, 7 );
 	$cl = '';
 	$i = 0;
 	foreach( $hours as $h ) {
-		$hours[$i++] = wlHoursLink( $h, $page );
+		$hours[$i++] = wlHoursLink( $h, $page, $options );
 	}
 	$i = 0;
 	foreach( $days as $d ) {
-		$days[$i++] = wlDaysLink( $d, $page );
+		$days[$i++] = wlDaysLink( $d, $page, $options );
 	}
 	return wfMsg ('wlshowlast',
 		implode(' | ', $hours),
 		implode(' | ', $days),
-		wlDaysLink( 0, $page ) );
+		wlDaysLink( 0, $page, $options ) );
 }
 
 ?>