-<?
-include_once( "SpecialRecentchanges.php" );
-include_once( "WatchedItem.php" );
-
-function wfSpecialWatchlist()
-{
- global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc;
+<?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
+require_once( "SpecialRecentchanges.php" );
+require_once( "WatchedItem.php" );
+
+/**
+ * constructor
+ */
+function wfSpecialWatchlist() {
+ global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc, $wgRequest;
global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
- global $days, $limit, $target; # From query string
$fname = "wfSpecialWatchlist";
$wgOut->setPagetitle( wfMsg( "watchlist" ) );
$wgOut->setSubtitle( $sub );
$wgOut->setRobotpolicy( "noindex,nofollow" );
+ $specialTitle = Title::makeTitle( NS_SPECIAL, "Watchlist" );
+
$uid = $wgUser->getID();
if( $uid == 0 ) {
$wgOut->addHTML( wfMsg( "nowatchlist" ) );
return;
}
- global $action,$remove,$id;
+ # Get query variables
+ $days = $wgRequest->getVal( 'days' );
+ $action = $wgRequest->getVal( 'action' );
+ $remove = $wgRequest->getVal( 'remove' );
+ $id = $wgRequest->getVal( 'id' );
+
if(($action == "submit") && isset($remove) && is_array($id)) {
$wgOut->addHTML( wfMsg( "removingchecked" ) );
foreach($id as $one) {
}
}
+ $dbr =& wfGetDB( DB_SLAVE );
+ extract( $dbr->tableNames( 'cur', 'watchlist', 'recentchanges' ) );
- $sql = "SELECT COUNT(*) AS n FROM watchlist WHERE wl_user=$uid";
- $res = wfQuery( $sql, DB_READ );
- $s = wfFetchObject( $res );
+ $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;
}
-
- if ( ! isset( $days ) ) {
+
+ if ( is_null( $days ) ) {
$big = 1000;
if($nitems > $big) {
# Set default cutoff shorter
} else {
$days = floatval($days);
}
-
+
if ( $days <= 0 ) {
$docutoff = '';
$cutoff = false;
$npages = wfMsg( "all" );
} else {
- $docutoff = "AND cur_timestamp > '" .
- ( $cutoff = wfUnix2Timestamp( time() - intval( $days * 86400 ) ) )
+ $docutoff = "AND cur_timestamp > '" .
+ ( $cutoff = $dbr->timestamp( time() - intval( $days * 86400 ) ) )
. "'";
- $sql = "SELECT COUNT(*) AS n FROM cur WHERE cur_timestamp>'$cutoff'";
- $res = wfQuery( $sql, DB_READ );
- $s = wfFetchObject( $res );
+ $sql = "SELECT COUNT(*) AS n FROM $cur WHERE cur_timestamp>'$cutoff'";
+ $res = $dbr->query( $sql );
+ $s = $dbr->fetchObject( $res );
$npages = $s->n;
+
}
-
+
if(isset($_REQUEST['magic'])) {
- $wgOut->addHTML( wfMsg( "watchlistcontains", $nitems ) .
+ $wgOut->addHTML( wfMsg( "watchlistcontains", $wgLang->formatNum( $nitems ) ) .
"<p>" . wfMsg( "watcheditlist" ) . "</p>\n" );
-
+
$wgOut->addHTML( "<form action='" .
- wfLocalUrl( $wgLang->specialPage( "Watchlist" ), "action=submit" ) .
+ $specialTitle->escapeLocalUrl( "action=submit" ) .
"' method='post'>\n" .
"<ul>\n" );
- $sql = "SELECT wl_namespace,wl_title FROM watchlist WHERE wl_user=$uid";
- $res = wfQuery( $sql, DB_READ );
- global $wgUser, $wgLang;
+ $sql = "SELECT wl_namespace,wl_title FROM $watchlist WHERE wl_user=$uid";
+ $res = $dbr->query( $sql );
$sk = $wgUser->getSkin();
- while( $s = wfFetchObject( $res ) ) {
+ while( $s = $dbr->fetchObject( $res ) ) {
$t = Title::makeTitle( $s->wl_namespace, $s->wl_title );
- $t = $t->getPrefixedText();
- $wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\">" .
- $sk->makeKnownLink( $t, $t ) .
- "</li>\n" );
+ 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" );
+ }
}
$wgOut->addHTML( "</ul>\n" .
- "<input type='submit' name='remove' value='" .
- wfMsg( "removechecked" ) . "'>\n" .
+ "<input type='submit' name='remove' value=\"" .
+ htmlspecialchars( wfMsg( "removechecked" ) ) . "\" />\n" .
"</form>\n" );
-
+
return;
}
-
+
# If the watchlist is relatively short, it's simplest to zip
# down its entirety and then sort the results.
-
+
# If it's relatively long, it may be worth our while to zip
# 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";
$z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
}
- $wgOut->addHTML( "<i>" . wfMsg( "watchdetails", $nitems, $npages, $y,
- wfLocalUrl( $wgLang->specialPage("Watchlist"),"magic=yes" ) ) . "</i><br>\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 ($x)
+ FROM $watchlist,$cur $use_index
WHERE wl_user=$uid
AND $z
AND wl_title=cur_title
ORDER BY cur_timestamp DESC";
- $res = wfQuery( $sql, DB_READ, $fname );
-
+ $res = $dbr->query( $sql, $fname );
+ $numRows = $dbr->numRows( $res );
if($days >= 1)
- $note = wfMsg( "rcnote", $limit, $days );
+ $note = wfMsg( "rcnote", $wgLang->formatNum( $numRows ), $wgLang->formatNum( $days ) );
elseif($days > 0)
- $note = wfMsg( "wlnote", $limit, round($days*24) );
+ $note = wfMsg( "wlnote", $wgLang->formatNum( $numRows ), $wgLang->formatNum( round($days*24) ) );
else
$note = "";
- $wgOut->addHTML( "\n<hr>\n{$note}\n<br>" );
- $note = wlCutoffLinks( $days, $limit );
+ $wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
+ $note = wlCutoffLinks( $days );
$wgOut->addHTML( "{$note}\n" );
- if ( wfNumRows( $res ) == 0 ) {
+ if ( $numRows == 0 ) {
$wgOut->addHTML( "<p><i>" . wfMsg( "watchnochange" ) . "</i></p>" );
return;
}
$sk = $wgUser->getSkin();
$s = $sk->beginRecentChangesList();
-
- while ( $obj = wfFetchObject( $res ) ) {
+ $counter = 1;
+ while ( $obj = $dbr->fetchObject( $res ) ) {
# Make fake RC entry
$rc = RecentChange::newFromCurRow( $obj );
+ $rc->counter = $counter++;
$s .= $sk->recentChangesLine( $rc, true );
}
$s .= $sk->endRecentChangesList();
- wfFreeResult( $res );
+ $dbr->freeResult( $res );
$wgOut->addHTML( $s );
if ( $wgUseWatchlistCache ) {
$wgMemc->set( $memckey, $s, $wgWLCacheTimeout);
}
+
}
function wlHoursLink( $h, $page ) {
- global $wgUser, $wgLang;
+ global $wgUser, $wgLang, $wgContLang;
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink(
- $wgLang->specialPage( $page ),
- $h, "days=" . ($h / 24.0) );
+ $wgContLang->specialPage( $page ),
+ $wgLang->formatNum( $h ),
+ "days=" . ($h / 24.0) );
return $s;
}
function wlDaysLink( $d, $page ) {
- global $wgUser, $wgLang;
+ global $wgUser, $wgLang, $wgContLang;
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink(
- $wgLang->specialPage( $page ),
- ($d ? $d : wfMsg( "all" ) ), "days=$d" );
+ $wgContLang->specialPage( $page ),
+ ($d ? $wgLang->formatNum( $d ) : wfMsg( "all" ) ), "days=$d" );
return $s;
}
-function wlCutoffLinks( $days, $limit, $page = "Watchlist" )
+function wlCutoffLinks( $days, $page = "Watchlist" )
{
$hours = array( 1, 2, 6, 12 );
$days = array( 1, 3, 7 );