X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSpecialWatchlist.php;h=4ab7c215d6da37301244a2597b4a08dd4d448915;hb=f10d65f0a3b716b7cc90f4aacec388e21f8ef644;hp=a84ad5e0a43d52d74db013d734a57d9c713de634;hpb=90155b8a9719ada6522a320a3315b4e698fdd970;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index a84ad5e0a4..4ab7c215d6 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -1,134 +1,197 @@
 <?php
 /**
  *
+ * @package MediaWiki
+ * @subpackage SpecialPage
  */
 
 /**
  *
  */
-require_once( "SpecialRecentchanges.php" );
-require_once( "WatchedItem.php" );
+require_once( 'SpecialRecentchanges.php' );
+require_once( 'WatchedItem.php' );
 
 /**
  * constructor
  */
-function wfSpecialWatchlist() {
-	global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc, $wgRequest;
+function wfSpecialWatchlist( $par ) {
+	global $wgUser, $wgOut, $wgLang, $wgMemc, $wgRequest, $wgContLang;
 	global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
-	$fname = "wfSpecialWatchlist";
+	global $wgRCShowWatchingUsers, $wgEnotifWatchlist, $wgShowUpdatedMarker;
+	global $wgEnotifWatchlist, $wgFilterRobotsWL;
+	$fname = 'wfSpecialWatchlist';
 
-	$wgOut->setPagetitle( wfMsg( "watchlist" ) );
-	$sub = wfMsg( "watchlistsub", $wgUser->getName() );
+	$wgOut->setPagetitle( wfMsg( 'watchlist' ) );
+	$sub = htmlspecialchars( wfMsg( 'watchlistsub', $wgUser->getName() ) );
 	$wgOut->setSubtitle( $sub );
-	$wgOut->setRobotpolicy( "noindex,nofollow" );
+	$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-	$specialTitle = Title::makeTitle( NS_SPECIAL, "Watchlist" );
+	$specialTitle = Title::makeTitle( NS_SPECIAL, 'Watchlist' );
 
-	$uid = $wgUser->getID();
-	if( $uid == 0 ) {
-		$wgOut->addHTML( wfMsg( "nowatchlist" ) );
+	if( $wgUser->isAnon() ) {
+		$wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
 		return;
 	}
 
+	$defaults = array(
+	/* float */ 'days' => 3.0, /* or 0.5, watch further below */
+	/* bool  */ 'hideOwn' => false,
+	/* bool  */ 'hideBots' => false,
+	);
+
+	extract($defaults);
+
 	# Get query variables
 	$days = $wgRequest->getVal( 'days' );
+	$hideOwn = $wgRequest->getBool( 'hideOwn' );
+	$hideBots = $wgRequest->getBool( 'hideBots' );
+
+	# Watchlist editing
 	$action = $wgRequest->getVal( 'action' );
 	$remove = $wgRequest->getVal( 'remove' );
-	$id = $wgRequest->getVal( 'id' );
+	$id = $wgRequest->getArray( 'id' );
+
+	$uid = $wgUser->getID();
+	if( $wgEnotifWatchlist && $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
+		$wgUser->clearAllNotifications( $uid );
+	}
 
-	if(($action == "submit") && isset($remove) && is_array($id)) {
-		$wgOut->addHTML( wfMsg( "removingchecked" ) );
+  # Deleting items from watchlist
+	if(($action == 'submit') && isset($remove) && is_array($id)) {
+		$wgOut->addWikiText( wfMsg( 'removingchecked' ) );
+		$wgOut->addHTML( '<p>' );
 		foreach($id as $one) {
 			$t = Title::newFromURL( $one );
-			if($t->getDBkey() != "") {
+			if( !is_null( $t ) ) {
 				$wl = WatchedItem::fromUserTitle( $wgUser, $t );
 				if( $wl->removeWatch() === false ) {
-					$wgOut->addHTML( "<br />\n" . wfMsg( "couldntremove", htmlspecialchars($one) ) );
+					$wgOut->addHTML( "<br />\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );
 				} else {
-					$wgOut->addHTML( " (" . htmlspecialchars($one) . ")" );
+					$wgOut->addHTML( ' (' . htmlspecialchars($one) . ')' );
 				}
 			} else {
-				$wgOut->addHTML( "<br />\n" . wfMsg( "iteminvalidname", htmlspecialchars($one) ) );
+				$wgOut->addHTML( "<br />\n" . wfMsg( 'iteminvalidname', htmlspecialchars($one) ) );
 			}
 		}
-		$wgOut->addHTML( "done.\n<p>" );
+		$wgOut->addHTML( "done.</p>\n" );
 	}
 
 	if ( $wgUseWatchlistCache ) {
 		$memckey = "$wgDBname:watchlist:id:" . $wgUser->getId();
 		$cache_s = @$wgMemc->get( $memckey );
 		if( $cache_s ){
-			$wgOut->addHTML( wfMsg("wlsaved") );
+			$wgOut->addWikiText( wfMsg('wlsaved') );
 			$wgOut->addHTML( $cache_s );
 			return;
 		}
 	}
 
 	$dbr =& wfGetDB( DB_SLAVE );
-	extract( $dbr->tableNames( 'cur', 'watchlist', 'recentchanges' ) );
+	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 );
+
+        #	Patch *** A1 *** (see A2 below)
+#	adjust for page X, talk:page X, which are both stored separately, but treated together
+	$nitems = floor($s->n / 2);
+#	$nitems = $s->n;
 
-	$sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
-	$res = $dbr->query( $sql );
-	$s = $dbr->fetchObject( $res );
-	$nitems = $s->n;
 	if($nitems == 0) {
-        $wgOut->addHTML( wfMsg( "nowatchlist" ) );
-        return;
+		$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);
+	wfAppendToArrayIfNotDefault( 'hideBots', $hideBots, $defaults, $nondefaults);
+
 	if ( $days <= 0 ) {
 		$docutoff = '';
 		$cutoff = false;
-		$npages = wfMsg( "all" );
+		$npages = wfMsg( 'watchlistall1' );
 	} else {
-	        $docutoff = "AND cur_timestamp > '" .
+	        $docutoff = "AND rev_timestamp > '" .
 		  ( $cutoff = $dbr->timestamp( time() - intval( $days * 86400 ) ) )
 		  . "'";
-	        $sql = "SELECT COUNT(*) AS n FROM $cur WHERE cur_timestamp>'$cutoff'";
-		$res = $dbr->query( $sql );
-		$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;
 
 	}
 
-	if(isset($_REQUEST['magic'])) {
-		$wgOut->addHTML( wfMsg( "watchlistcontains", $wgLang->formatNum( $nitems ) ) .
-			"<p>" . wfMsg( "watcheditlist" ) . "</p>\n" );
+	/* Edit watchlist form */
+	if($wgRequest->getBool('edit') || $par == 'edit' ) {
+		$wgOut->addWikiText( wfMsg( 'watchlistcontains', $wgLang->formatNum( $nitems ) ) .
+			"\n\n" . wfMsg( 'watcheditlist' ) );
+
+		$wgOut->addHTML( '<form action=\'' .
+			$specialTitle->escapeLocalUrl( 'action=submit' ) .
+			"' method='post'>\n" );
 
-		$wgOut->addHTML( "<form action='" .
-			$specialTitle->escapeLocalUrl( "action=submit" ) .
-			"' method='post'>\n" .
-			"<ul>\n" );
+#		Patch A2
+#		The following was proposed by KTurner 07.11.2004 to T.Gries
+#		$sql = "SELECT distinct (wl_namespace & ~1),wl_title FROM $watchlist WHERE wl_user=$uid";
 		$sql = "SELECT wl_namespace,wl_title FROM $watchlist WHERE wl_user=$uid";
-		$res = $dbr->query( $sql );
+
+		$res = $dbr->query( $sql, $fname );
 		$sk = $wgUser->getSkin();
+
+		$list = array();
 		while( $s = $dbr->fetchObject( $res ) ) {
-			$t = Title::makeTitle( $s->wl_namespace, $s->wl_title );
-			if( is_null( $t ) ) {
-				$wgOut->addHTML( '<!-- bad title "' . htmlspecialchars( $s->wl_title ) . '" in namespace ' . IntVal( $s->wl_namespace ) . " -->\n" );
-			} else {
-				$t = $t->getPrefixedText();
-				$wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\" />" .
-					$sk->makeLink( $t, $t ) .
-					"</li>\n" );
+			$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)
+				$wgOut->addHTML( '<h2>' . $wgContLang->getFormattedNsText( $ns ) . '</h2>' );
+			$wgOut->addHTML( '<ul>' );
+			foreach($titles as $title) {
+				$t = Title::makeTitle( $ns, $title );
+				if( is_null( $t ) ) {
+					$wgOut->addHTML(
+						'<!-- bad title "' .
+						htmlspecialchars( $s->wl_title ) . '" in namespace ' . $s->wl_namespace . " -->\n"
+					);
+				} else {
+					$t = $t->getPrefixedText();
+					$wgOut->addHTML(
+						'<li><input type="checkbox" name="id[]" value="' . htmlspecialchars($t) . '" />' .
+						$sk->makeLink( $t, $t ) .
+						"</li>\n"
+					);
+				}
 			}
+			$wgOut->addHTML( '</ul>' );
 		}
-		$wgOut->addHTML( "</ul>\n" .
-			"<input type='submit' name='remove' value='" .
-			wfMsg( "removechecked" ) . "' />\n" .
-			"</form>\n" );
+		$wgOut->addHTML(
+			"<input type='submit' name='remove' value=\"" .
+			htmlspecialchars( wfMsg( "removechecked" ) ) . "\" />\n" .
+			"</form>\n"
+		);
 
 		return;
 	}
@@ -140,60 +203,124 @@ function wfSpecialWatchlist() {
 	# 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 = "cur_timestamp";
-		$y = wfMsg( "watchmethod-recent" );
-		$z = "wl_namespace=cur_namespace&65534";
+
+	$andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
+	if( $wgFilterRobotsWL ) {
+		$andHideBotsOptional = $hideBots ? "AND (rc_bot = 0)" : '';
 	} else {
-		$x = "name_title_timestamp";
-		$y = wfMsg( "watchmethod-list" );
-		$z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
+		$andHideBotsOptional = "AND rc_this_oldid=page_latest";
+	}
+		
+	
+	# Show watchlist header
+	$header = '';
+	if( $wgUser->getOption( 'enotifwatchlistpages' ) && $wgEnotifWatchlist) {
+		$header .= wfMsg( 'wlheader-enotif' ) . "\n";
+	}
+	if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
+		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
 	}
 
+	# TODO: Consider removing the third parameter
+	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems ), 
+		$wgLang->formatNum( $npages ), '',
+		$specialTitle->getFullUrl( 'edit=yes' ) );
+	$wgOut->addWikiText( $header );
+	
+	if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
+		$wgOut->addHTML( '<form action="' .
+			$specialTitle->escapeLocalUrl() .
+			'" method="post"><input type="submit" name="dummy" value="' .
+			htmlspecialchars( wfMsg( 'enotif_reset' ) ) .
+			'" /><input type="hidden" name="reset" value="all" /></form>' .
+			"\n\n" );
+	}
 
-	$wgOut->addHTML( "<i>" . wfMsg( "watchdetails",
-		$wgLang->formatNum( $nitems ), $wgLang->formatNum( $npages ), $y,
-		$specialTitle->escapeLocalUrl( "magic=yes" ) ) . "</i><br />\n" );
-
-	$use_index = $dbr->useIndexClause( $x );
-	$sql = "SELECT
-  cur_namespace,cur_title,cur_comment, cur_id,
-  cur_user,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new
-  FROM $watchlist,$cur $use_index
-  WHERE wl_user=$uid
-  AND $z
-  AND wl_title=cur_title
-  $docutoff
-  ORDER BY cur_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
+          $andHideOwn
+          $andHideBotsOptional
+          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) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
+		wfArrayToCGI( array('hideOwn' => 1-$hideOwn ), $nondefaults ) );
+	$wgOut->addHTML( wfMsgHtml( "wlhideshowown", $s ) );
+
+	if( $wgFilterRobotsWL ) {
+		$s = $sk->makeKnownLink(
+      $wgContLang->specialPage( 'Watchlist' ),
+		  (0 == $hideBots) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
+		  wfArrayToCGI( array('hideBots' => 1-$hideBots ), $nondefaults ) );
+	  $wgOut->addHTML( wfMsgHtml( "wlhideshowbots", "  $s" ) );
+	}
+	
 	if ( $numRows == 0 ) {
-		$wgOut->addHTML( "<p><i>" . wfMsg( "watchnochange" ) . "</i></p>" );
+		$wgOut->addWikitext( "<br />" . wfMsg( 'watchnochange' ), false );
+		$wgOut->addHTML( "</p>\n" );
 		return;
 	}
 
-	$sk = $wgUser->getSkin();
-	$s = $sk->beginRecentChangesList();
+	$wgOut->addHTML( "</p>\n" );
+	/* End bottom header */
+
+	$list = ChangesList::newFromUser( $wgUser );
+
+	$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++;
-		$s .= $sk->recentChangesLine( $rc, true );
+
+		if ( $wgShowUpdatedMarker ) {
+			$updated = $obj->wl_notificationtimestamp;
+		} else {
+			// Same visual appearance as MW 1.4
+			$updated = true;
+		}
+
+		if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+			$sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" .wfStrencode($obj->page_title). "' AND wl_namespace='{$obj->page_namespace}'" ;
+			$res3 = $dbr->query( $sql3, DB_READ, $fname );
+			$x = $dbr->fetchObject( $res3 );
+			$rc->numberofWatchingusers = $x->n;
+		} else {
+			$rc->numberofWatchingusers = 0;
+		}
+
+		$s .= $list->recentChangesLine( $rc, $updated );
 	}
-	$s .= $sk->endRecentChangesList();
+	$s .= $list->endRecentChangesList();
 
 	$dbr->freeResult( $res );
 	$wgOut->addHTML( $s );
@@ -204,44 +331,42 @@ function wfSpecialWatchlist() {
 
 }
 
-
-function wlHoursLink( $h, $page ) {
-	global $wgUser, $wgLang;
+function wlHoursLink( $h, $page, $options = array() ) {
+	global $wgUser, $wgLang, $wgContLang;
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
-	  $wgLang->specialPage( $page ),
+	  $wgContLang->specialPage( $page ),
 	  $wgLang->formatNum( $h ),
-	  "days=" . ($h / 24.0) );
+	  wfArrayToCGI( array('days' => ($h / 24.0)), $options ) );
 	return $s;
 }
 
-
-function wlDaysLink( $d, $page ) {
-	global $wgUser, $wgLang;
+function wlDaysLink( $d, $page, $options = array() ) {
+	global $wgUser, $wgLang, $wgContLang;
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
-	  $wgLang->specialPage( $page ),
-	  ($d ? $wgLang->formatNum( $d ) : wfMsg( "all" ) ), "days=$d" );
+	  $wgContLang->specialPage( $page ),
+	  ($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 = "";
+	$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 ) );
+	return wfMsg ('wlshowlast',
+		implode(' | ', $hours),
+		implode(' | ', $days),
+		wlDaysLink( 0, $page, $options ) );
 }
 
 ?>