-<?
-global $IP;
-include_once( "$IP/SpecialRecentchanges.php" );
+<?php
+include_once( "SpecialRecentchanges.php" );
+include_once( "WatchedItem.php" );
function wfSpecialWatchlist()
{
- global $wgUser, $wgOut, $wgLang, $wgTitle;
+ global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc;
+ global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
global $days, $limit, $target; # From query string
$fname = "wfSpecialWatchlist";
$wgOut->setPagetitle( wfMsg( "watchlist" ) );
- $sub = str_replace( "$1", $wgUser->getName(), wfMsg( "watchlistsub" ) );
+ $sub = wfMsg( "watchlistsub", $wgUser->getName() );
$wgOut->setSubtitle( $sub );
$wgOut->setRobotpolicy( "noindex,nofollow" );
+ $specialTitle = Title::makeTitle( NS_SPECIAL, "Watchlist" );
+
$uid = $wgUser->getID();
if( $uid == 0 ) {
$wgOut->addHTML( wfMsg( "nowatchlist" ) );
foreach($id as $one) {
$t = Title::newFromURL( $one );
if($t->getDBkey() != "") {
- $sql = "DELETE FROM watchlist WHERE wl_user=$uid AND " .
- "wl_namespace=" . $t->getNamespace() . " AND " .
- "wl_title='" . wfStrencode( $t->getDBkey() ) . "'";
- $res = wfQuery( $sql );
- if($res === FALSE) {
+ $wl = WatchedItem::fromUserTitle( $wgUser, $t );
+ if( $wl->removeWatch() === false ) {
$wgOut->addHTML( "<br />\n" . wfMsg( "couldntremove", htmlspecialchars($one) ) );
} else {
$wgOut->addHTML( " (" . htmlspecialchars($one) . ")" );
$wgOut->addHTML( "done.\n<p>" );
}
+ if ( $wgUseWatchlistCache ) {
+ $memckey = "$wgDBname:watchlist:id:" . $wgUser->getId();
+ $cache_s = @$wgMemc->get( $memckey );
+ if( $cache_s ){
+ $wgOut->addHTML( wfMsg("wlsaved") );
+ $wgOut->addHTML( $cache_s );
+ return;
+ }
+ }
+
+
$sql = "SELECT COUNT(*) AS n FROM watchlist WHERE wl_user=$uid";
- $res = wfQuery( $sql );
+ $res = wfQuery( $sql, DB_READ );
$s = wfFetchObject( $res );
$nitems = $s->n;
}
if ( ! isset( $days ) ) {
- $big = 250;
+ $big = 1000;
if($nitems > $big) {
# Set default cutoff shorter
- $days = (1.0 / 24.0); # 1 hour...
+ $days = (12.0 / 24.0); # 12 hours...
} else {
- $days = 0; # no time cutoff for shortlisters
+ $days = 3; # longer cutoff for shortlisters
}
} else {
$days = floatval($days);
( $cutoff = wfUnix2Timestamp( time() - intval( $days * 86400 ) ) )
. "'";
$sql = "SELECT COUNT(*) AS n FROM cur WHERE cur_timestamp>'$cutoff'";
- $res = wfQuery( $sql );
+ $res = wfQuery( $sql, DB_READ );
$s = wfFetchObject( $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 );
+ $res = wfQuery( $sql, DB_READ );
global $wgUser, $wgLang;
$sk = $wgUser->getSkin();
while( $s = wfFetchObject( $res ) ) {
$t = Title::makeTitle( $s->wl_namespace, $s->wl_title );
$t = $t->getPrefixedText();
- $wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\">" .
+ $wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\" />" .
$sk->makeKnownLink( $t, $t ) .
"</li>\n" );
}
$wgOut->addHTML( "</ul>\n" .
"<input type='submit' name='remove' value='" .
- wfMsg( "removechecked" ) . "'>\n" .
+ wfMsg( "removechecked" ) . "' />\n" .
"</form>\n" );
return;
$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" );
$sql = "SELECT
- cur_namespace,cur_title,cur_comment,
+ 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)
WHERE wl_user=$uid
ORDER BY cur_timestamp DESC";
- $res = wfQuery( $sql, $fname );
+ $res = wfQuery( $sql, DB_READ, $fname );
if($days >= 1)
- $note = wfMsg( "rcnote", $limit, $days );
+ $note = wfMsg( "rcnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( $days ) );
elseif($days > 0)
- $note = wfMsg( "wlnote", $limit, round($days*24) );
+ $note = wfMsg( "wlnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( round($days*24) ) );
else
$note = "";
- $wgOut->addHTML( "\n<hr>\n{$note}\n<br>" );
+ $wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
$note = wlCutoffLinks( $days, $limit );
$wgOut->addHTML( "{$note}\n" );
$sk = $wgUser->getSkin();
$s = $sk->beginRecentChangesList();
-
+ $counter = 1;
while ( $obj = wfFetchObject( $res ) ) {
- $ts = $obj->cur_timestamp;
- $u = $obj->cur_user;
- $ut = $obj->cur_user_text;
- $ns = $obj->cur_namespace;
- $ttl = $obj->cur_title;
- $com = $obj->cur_comment;
- $me = ( $obj->cur_minor_edit > 0 );
- $new = ( $obj->cur_is_new > 0 );
- $watched = true;
-
- $s .= $sk->recentChangesLine( $ts, $u, $ut, $ns, $ttl, $com, $me, $new, $watched );
+ # Make fake RC entry
+ $rc = RecentChange::newFromCurRow( $obj );
+ $rc->counter = $counter++;
+ $s .= $sk->recentChangesLine( $rc, true );
}
$s .= $sk->endRecentChangesList();
wfFreeResult( $res );
$wgOut->addHTML( $s );
+
+ if ( $wgUseWatchlistCache ) {
+ $wgMemc->set( $memckey, $s, $wgWLCacheTimeout);
+ }
}
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink(
$wgLang->specialPage( $page ),
- $h, "days=" . ($h / 24.0) );
+ $wgLang->formatNum( $h ),
+ "days=" . ($h / 24.0) );
return $s;
}
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink(
$wgLang->specialPage( $page ),
- ($d ? $d : wfMsg( "all" ) ), "days=$d" );
+ ($d ? $wgLang->formatNum( $d ) : wfMsg( "all" ) ), "days=$d" );
return $s;
}
foreach( $days as $d ) {
$days[$i++] = wlDaysLink( $d, $page );
}
- return
- wfMsg ("wlshowlast") .
- implode(" | ", $hours) . wfMsg("wlhours") .
- implode(" | ", $days) . wfMsg("wldays") .
- wlDaysLink( 0, $page );
-# $note = wfMsg( "rclinks", $cl, $dl, $mlink );
+ return wfMsg ("wlshowlast",
+ implode(" | ", $hours),
+ implode(" | ", $days),
+ wlDaysLink( 0, $page ) );
}
?>
dépôts / lhc / web / wiklou.git / blobdiff