*
*/
require_once( 'Feed.php' );
+require_once( 'ChangesList.php' );
+require_once( 'Revision.php' );
/**
* Constructor
function wfSpecialRecentchanges( $par ) {
global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
- global $wgFeedClasses;
+ global $wgFeedClasses, $wgUseRCPatrol;
+ global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
$fname = 'wfSpecialRecentchanges';
# Get query parameters
$days = $wgRequest->getInt( 'days', $defaultDays );
$hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor' ) ) ? 1 : 0;
- $from = $wgRequest->getText( 'from' );
- $hidebots = $wgRequest->getBool( 'hidebots', true ) ? 1 : 0;
- $hideliu = $wgRequest->getBool( 'hideliu', false ) ? 1 : 0;
- $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', false ) ? 1 : 0;
-
list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
-
- # Get query parameters from path
- if( $par ) {
- $bits = preg_split( '/\s*,\s*/', trim( $par ) );
- if( in_array( 'hidebots', $bits ) ) $hidebots = 1;
- if( in_array( 'bots', $bits ) ) $hidebots = 0;
- if( in_array( 'hideminor', $bits ) ) $hideminor = 1;
- if( in_array( 'minor', $bits ) ) $hideminor = 0;
- if( in_array( 'hideliu', $bits) ) $hideliu = 1;
- if( in_array( 'hidepatrolled', $bits) ) $hidepatrolled = 1;
+
+ # As a feed, use limited settings only
+ if( $feedFormat ) {
+ $from = null;
+ $hidebots = 1;
+ $hideliu = 0;
+ $hidepatrolled = 0;
+ global $wgFeedLimit;
+ if( $limit > $wgFeedLimit ) {
+ $limit = $wgFeedLimit;
+ }
+ } else {
+ $from = $wgRequest->getText( 'from' );
+ $hidebots = $wgRequest->getBool( 'hidebots', true ) ? 1 : 0;
+ $hideliu = $wgRequest->getBool( 'hideliu', false ) ? 1 : 0;
+ $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', false ) ? 1 : 0;
+
+ # Get query parameters from path
+ if( $par ) {
+ $bits = preg_split( '/\s*,\s*/', trim( $par ) );
+ if( in_array( 'hidebots', $bits ) ) $hidebots = 1;
+ if( in_array( 'bots', $bits ) ) $hidebots = 0;
+ if( in_array( 'hideminor', $bits ) ) $hideminor = 1;
+ if( in_array( 'minor', $bits ) ) $hideminor = 0;
+ if( in_array( 'hideliu', $bits) ) $hideliu = 1;
+ if( in_array( 'hidepatrolled', $bits) ) $hidepatrolled = 1;
+ }
}
$dbr =& wfGetDB( DB_SLAVE );
extract( $dbr->tableNames( 'recentchanges', 'watchlist' ) );
- $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, $fname );
+
# 10 seconds server-side caching max
$wgOut->setSquidMaxage( 10 );
- if( $wgOut->checkLastModified( $lastmod ) ){
- # Client cache fresh and headers sent, nothing more to do.
- return;
+
+ # Get last modified date, for client caching
+ # Don't use this if we are using the patrol feature, patrol changes don't update the timestamp
+ $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, $fname );
+ if ( $feedFormat || !$wgUseRCPatrol ) {
+ if( $lastmod && $wgOut->checkLastModified( $lastmod ) ){
+ # Client cache fresh and headers sent, nothing more to do.
+ return;
+ }
}
# Output header
- $rctext = wfMsg( "recentchangestext" );
+ $rctext = wfMsgForContent( "recentchangestext" );
$wgOut->addWikiText( $rctext );
$hidem .= ( $hidepatrolled )? ' AND rc_patrolled=0' : '';
$urlparams = array( 'hideminor' => $hideminor, 'hideliu' => $hideliu,
- 'hidebots' => $hidebots, 'hidepatrolled' => $hidepatrolled);
+ 'hidebots' => $hidebots, 'hidepatrolled' => $hidepatrolled,
+ 'limit' => $limit );
$hideparams = wfArrayToCGI( $urlparams );
$minorLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
$showhide[1-$hidepatrolled], wfArrayToCGI( array( 'hidepatrolled' => 1-$hidepatrolled ), $urlparams ) );
$uid = $wgUser->getID();
- $sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user" : "") . " FROM $recentchanges " .
- ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace & 65534 " : "") .
+ # Patch for showing "updated since last visit" marker
+ $sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user,wl_notificationtimestamp" : "") . " FROM $recentchanges " .
+ ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
"WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
"ORDER BY rc_timestamp DESC LIMIT {$limit}";
- $res = $dbr->query( $sql2, DB_SLAVE, $fname );
+ $res = $dbr->query( $sql2, $fname );
$rows = array();
while( $row = $dbr->fetchObject( $res ) ){
$rows[] = $row;
$wgOut->addHTML( $note."\n" );
- if( isset($wgFeedClasses[$feedFormat]) ) {
- $feed = new $wgFeedClasses[$feedFormat](
- $wgSitename . ' - ' . wfMsg( 'recentchanges' ) . ' [' . $wgContLanguageCode . ']',
- htmlspecialchars( wfMsg( 'recentchangestext' ) ),
- $wgTitle->getFullUrl() );
- $feed->outHeader();
- foreach( $rows as $obj ) {
- $title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title );
- $talkpage = $title->getTalkPage();
- $item = new FeedItem(
- $title->getPrefixedText(),
- htmlspecialchars( $obj->rc_comment ),
- $title->getFullURL(),
- $obj->rc_timestamp,
- $obj->rc_user_text,
- $talkpage->getFullURL()
- );
- $feed->outItem( $item );
- }
- $feed->outFooter();
+ if( $feedFormat ) {
+ rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod );
} else {
+ # Web output...
$wgOut->setSyndicated( true );
- $s = $sk->beginRecentChangesList();
+ $list =& new ChangesList( $sk );
+ $s = $list->beginRecentChangesList();
$counter = 1;
foreach( $rows as $obj ){
if( $limit == 0) {
! ( $hidepatrolled && $obj->rc_patrolled ) ) {
$rc = RecentChange::newFromRow( $obj );
$rc->counter = $counter++;
- $s .= $sk->recentChangesLine( $rc, !empty( $obj->wl_user ) );
+
+ if ($wgShowUpdatedMarker
+ && $wgUser->getOption( 'showupdated' )
+ && !empty( $obj->wl_notificationtimestamp )
+ && ($obj->rc_timestamp >= $obj->wl_notificationtimestamp)) {
+ $rc->notificationtimestamp = true;
+ } else {
+ $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;
+ }
+ $s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
--$limit;
}
}
- $s .= $sk->endRecentChangesList();
+ $s .= $list->endRecentChangesList();
$wgOut->addHTML( $s );
}
}
+function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
+ global $messageMemc, $wgDBname, $wgFeedCacheTimeout;
+ global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
+
+ if( !isset( $wgFeedClasses[$feedFormat] ) ) {
+ wfHttpError( 500, "Internal Server Error", "Unsupported feed type." );
+ return false;
+ }
+
+ $timekey = "$wgDBname:rcfeed:timestamp";
+ $key = "$wgDBname:rcfeed:$feedFormat:limit:$limit:minor:$hideminor";
+
+ $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchanges' ) .
+ ' [' . $wgContLanguageCode . ']';
+ $feed = new $wgFeedClasses[$feedFormat](
+ $feedTitle,
+ htmlspecialchars( wfMsgForContent( 'recentchangestext' ) ),
+ $wgTitle->getFullUrl() );
+
+ /**
+ * Bumping around loading up diffs can be pretty slow, so where
+ * possible we want to cache the feed output so the next visitor
+ * gets it quick too.
+ */
+ $cachedFeed = false;
+ if( $feedLastmod = $messageMemc->get( $timekey ) ) {
+ /**
+ * If the cached feed was rendered very recently, we may
+ * go ahead and use it even if there have been edits made
+ * since it was rendered. This keeps a swarm of requests
+ * from being too bad on a super-frequently edited wiki.
+ */
+ if( time() - wfTimestamp( TS_UNIX, $feedLastmod )
+ < $wgFeedCacheTimeout
+ || wfTimestamp( TS_UNIX, $feedLastmod )
+ > wfTimestamp( TS_UNIX, $lastmod ) ) {
+ wfDebug( "RC: loading feed from cache ($key; $feedLastmod; $lastmod)...\n" );
+ $cachedFeed = $messageMemc->get( $key );
+ } else {
+ wfDebug( "RC: cached feed timestamp check failed ($feedLastmod; $lastmod)\n" );
+ }
+ }
+ if( is_string( $cachedFeed ) ) {
+ wfDebug( "RC: Outputting cached feed\n" );
+ $feed->httpHeaders();
+ echo $cachedFeed;
+ } else {
+ wfDebug( "RC: rendering new feed and caching it\n" );
+ ob_start();
+ rcDoOutputFeed( $rows, $feed );
+ $cachedFeed = ob_get_contents();
+ ob_end_flush();
+
+ $expire = 3600 * 24; # One day
+ $messageMemc->set( $key, $cachedFeed );
+ $messageMemc->set( $timekey, wfTimestamp( TS_MW ), $expire );
+ }
+ return true;
+}
+
+function rcDoOutputFeed( $rows, &$feed ) {
+ global $wgSitename, $wgFeedClasses, $wgContLanguageCode;
+
+ $feed->outHeader();
+
+ # Merge adjacent edits by one user
+ $sorted = array();
+ $n = 0;
+ foreach( $rows as $obj ) {
+ if( $n > 0 &&
+ $obj->rc_namespace >= 0 &&
+ $obj->rc_cur_id == $sorted[$n-1]->rc_cur_id &&
+ $obj->rc_user_text == $sorted[$n-1]->rc_user_text ) {
+ $sorted[$n-1]->rc_last_oldid = $obj->rc_last_oldid;
+ } else {
+ $sorted[$n] = $obj;
+ $n++;
+ }
+ $first = false;
+ }
+
+ foreach( $sorted as $obj ) {
+ $title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title );
+ $talkpage = $title->getTalkPage();
+ $item = new FeedItem(
+ $title->getPrefixedText(),
+ rcFormatDiff( $obj ),
+ $title->getFullURL(),
+ $obj->rc_timestamp,
+ $obj->rc_user_text,
+ $talkpage->getFullURL()
+ );
+ $feed->outItem( $item );
+ }
+ $feed->outFooter();
+}
+
/**
*
*/
global $wgUser, $wgLang, $wgContLang;
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink( $wgContLang->specialPage( $page ),
- ($lim ? $wgLang->formatNum( "{$lim}" ) : wfMsg( 'all' ) ), "{$more}" .
+ ($lim ? $wgLang->formatNum( "{$lim}" ) : wfMsg( 'recentchangesall' ) ), "{$more}" .
($d ? "days={$d}&" : '') . 'limit='.$lim );
return $s;
}
global $wgUser, $wgLang, $wgContLang;
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink( $wgContLang->specialPage( $page ),
- ($d ? $wgLang->formatNum( "{$d}" ) : wfMsg( "all" ) ), $more.'days='.$d .
+ ($d ? $wgLang->formatNum( "{$d}" ) : wfMsg( 'recentchangesall' ) ), $more.'days='.$d .
($lim ? '&limit='.$lim : '') );
return $s;
}
/**
- *
+ * Used also by Recentchangeslinked
*/
function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall = false, $minorLink = '',
$botLink = '', $liuLink = '', $patrLink = '' ) {
}
/**
- * Obsolete? Isn't called from anywhere and $mlink isn't defined
+ * Format a diff for the newsfeed
*/
-function rcLimitLinks( $page='Recentchanges', $more='', $doall = false ) {
- if ($more != '') $more .= '&';
- $cl = rcCountLink( 50, 0, $page, $more ) . ' | ' .
- rcCountLink( 100, 0, $page, $more ) . ' | ' .
- rcCountLink( 250, 0, $page, $more ) . ' | ' .
- rcCountLink( 500, 0, $page, $more ) .
- ( $doall ? ( ' | ' . rcCountLink( 0, $days, $page, $more ) ) : '' );
- $note = wfMsg( 'rclinks', $cl, '', $mlink );
- return $note;
+function rcFormatDiff( $row ) {
+ $fname = 'rcFormatDiff';
+ wfProfileIn( $fname );
+
+ require_once( 'DifferenceEngine.php' );
+ $comment = "<p>" . htmlspecialchars( $row->rc_comment ) . "</p>\n";
+
+ if( $row->rc_namespace >= 0 ) {
+ global $wgContLang;
+
+ #$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 ) {
+ 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 );
+ $diffText = '<a href="' .
+ $diffLink .
+ '">' .
+ htmlspecialchars( wfMsgForContent( 'difference' ) ) .
+ '</a>';
+ } else {
+ $diffText = DifferenceEngine::getDiff( $oldtext, $newtext,
+ wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
+ wfMsg( 'currentrev' ) );
+ }
+ wfProfileOut( "$fname-dodiff" );
+ } else {
+ $diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
+ '<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
+ }
+
+ wfProfileOut( $fname );
+ return $comment . $diffText;
+ }
+
+ wfProfileOut( $fname );
+ return $comment;
}
?>
dépôts / lhc / web / wiklou.git / blobdiff