From 58f7bb30a04d6c1f137cc1659b8998c5349bf13e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Tue, 17 Jun 2008 08:24:00 +0000 Subject: [PATCH] Refactored SpecialRecentchanges: * Use a class and new frameworks * Split into functions * Two new hooks * Split feed related items to new classes that are autoloaded --- docs/hooks.txt | 10 + includes/AutoLoader.php | 3 + includes/ChangesFeed.php | 129 ++++ includes/FeedUtils.php | 151 ++++ includes/PageHistory.php | 18 +- includes/SpecialPage.php | 2 +- includes/specials/Recentchanges.php | 867 +++++++++------------- includes/specials/Recentchangeslinked.php | 20 +- 8 files changed, 649 insertions(+), 551 deletions(-) create mode 100644 includes/ChangesFeed.php create mode 100644 includes/FeedUtils.php diff --git a/docs/hooks.txt b/docs/hooks.txt index 9dcd9176fa..abb4cd0562 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1099,6 +1099,16 @@ $funct: function called to execute the special page 'SpecialPage_initList': called when setting up SpecialPage::$mList, use this hook to remove a core special page $list: list (array) of core special pages +'SpecialRecentChangesPanel' called when building form options in SpecialRecentChanges +&$extraOpts: array of added items, to which can be added +$opts: FormOptions for this request + +'SpecialRecentChangesQuery': called when building sql query for SpecialRecentChanges +&$conds: array of where conditionals for query +&$tables: array of tables to be queried +&$join_conds: join conditions for the tables +$opts: FormOptions for this request + 'SpecialSearchNogomatch': called when user clicked the "Go" button but the target doesn't exist $title: title object generated from the text entred by the user diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index a823057d14..27ebd521b6 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -26,6 +26,7 @@ class AutoLoader { 'CategoryPage' => 'includes/CategoryPage.php', 'CategoryViewer' => 'includes/CategoryPage.php', 'ChangesList' => 'includes/ChangesList.php', + 'ChangesFeed' => 'includes/ChangesFeed.php', 'ChannelFeed' => 'includes/Feed.php', 'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php', 'ConstantDependency' => 'includes/CacheDependency.php', @@ -69,6 +70,7 @@ class AutoLoader { 'FakeTitle' => 'includes/FakeTitle.php', 'FauxRequest' => 'includes/WebRequest.php', 'FeedItem' => 'includes/Feed.php', + 'FeedUtils' => 'includes/FeedUtils.php', 'FileDeleteForm' => 'includes/FileDeleteForm.php', 'FileDependency' => 'includes/CacheDependency.php', 'FileRevertForm' => 'includes/FileRevertForm.php', @@ -421,6 +423,7 @@ class AutoLoader { 'SpecialMostlinkedtemplates' => 'includes/specials/Mostlinkedtemplates.php', 'SpecialPrefixindex' => 'includes/specials/Prefixindex.php', 'SpecialRandomredirect' => 'includes/specials/Randomredirect.php', + 'SpecialRecentChanges' => 'includes/specials/Recentchanges.php', 'SpecialSearch' => 'includes/specials/Search.php', 'SpecialVersion' => 'includes/specials/Version.php', 'UncategorizedCategoriesPage' => 'includes/specials/Uncategorizedcategories.php', diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php new file mode 100644 index 0000000000..9bee179030 --- /dev/null +++ b/includes/ChangesFeed.php @@ -0,0 +1,129 @@ +format = $format; + $this->type = $type; + } + + public function getFeedObject( $title, $description ) { + global $wgSitename, $wgContLanguageCode, $wgFeedClasses, $wgTitle; + $feedTitle = "$wgSitename - {$title} [$wgContLanguageCode]"; + + return new $wgFeedClasses[$this->format]( + $feedTitle, htmlspecialchars( $description ), $wgTitle->getFullUrl() ); + } + + public function execute( $feed, $rows, $limit = 0 , $hideminor = false, $lastmod = false ) { + global $messageMemc, $wgFeedCacheTimeout; + global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode; + + if ( !FeedUtils::checkFeedOutput( $this->format ) ) { + return; + } + + $timekey = wfMemcKey( $this->type, $this->format, 'timestamp' ); + $key = wfMemcKey( $this->type, $this->format, 'limit', $limit, 'minor', $hideminor ); + + FeedUtils::checkPurge($timekey, $key); + + /* + * 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 = $this->loadFromCache( $lastmod, $timekey, $key ); + 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(); + self::generateFeed( $rows, $feed ); + $cachedFeed = ob_get_contents(); + ob_end_flush(); + $this->saveToCache( $cachedFeed, $timekey, $key ); + } + return true; + } + + public function saveToCache( $feed, $timekey, $key ) { + global $messageMemc; + $expire = 3600 * 24; # One day + $messageMemc->set( $key, $feed ); + $messageMemc->set( $timekey, wfTimestamp( TS_MW ), $expire ); + } + + public function loadFromCache( $lastmod, $timekey, $key ) { + global $wgFeedCacheTimeout, $messageMemc; + $feedLastmod = $messageMemc->get( $timekey ); + + if( ( $wgFeedCacheTimeout > 0 ) && $feedLastmod ) { + /* + * 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. + */ + + $feedAge = time() - wfTimestamp( TS_UNIX, $feedLastmod ); + $feedLastmodUnix = wfTimestamp( TS_UNIX, $feedLastmod ); + $lastmodUnix = wfTimestamp( TS_UNIX, $lastmod ); + + if( $feedAge < $wgFeedCacheTimeout || $feedLastmodUnix > $lastmodUnix) { + wfDebug( "RC: loading feed from cache ($key; $feedLastmod; $lastmod)...\n" ); + return $messageMemc->get( $key ); + } else { + wfDebug( "RC: cached feed timestamp check failed ($feedLastmod; $lastmod)\n" ); + } + } + return false; + } + + /** + * @todo document + * @param $rows Database resource with recentchanges rows + * @param $feed Feed object + */ + public static function generateFeed( $rows, &$feed ) { + wfProfileIn( __METHOD__ ); + + $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++; + } + } + + foreach( $sorted as $obj ) { + $title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title ); + $talkpage = $title->getTalkPage(); + $item = new FeedItem( + $title->getPrefixedText(), + FeedUtils::formatDiff( $obj ), + $title->getFullURL( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ), + $obj->rc_timestamp, + ($obj->rc_deleted & Revision::DELETED_USER) ? wfMsgHtml('rev-deleted-user') : $obj->rc_user_text, + $talkpage->getFullURL() + ); + $feed->outItem( $item ); + } + $feed->outFooter(); + wfProfileOut( __METHOD__ ); + } + +} \ No newline at end of file diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php new file mode 100644 index 0000000000..4412a14bcf --- /dev/null +++ b/includes/FeedUtils.php @@ -0,0 +1,151 @@ +getVal( 'action' ) === 'purge'; + if ( $purge && $wgUser->isAllowed('purge') ) { + $messageMemc->delete( $timekey ); + $messageMemc->delete( $key ); + } + } + + public static function checkFeedOutput( $type ) { + global $wgFeed, $wgOut, $wgFeedClasses; + + if ( !$wgFeed ) { + global $wgOut; + $wgOut->addWikiMsg( 'feed-unavailable' ); + return false; + } + + if( !isset( $wgFeedClasses[$type] ) ) { + wfHttpError( 500, "Internal Server Error", "Unsupported feed type." ); + return false; + } + + return true; + } + + /** + * Format a diff for the newsfeed + */ + public static function formatDiff( $row ) { + global $wgUser; + + $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title ); + $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp ); + $actiontext = ''; + if( $row->rc_type == RC_LOG ) { + if( $row->rc_deleted & LogPage::DELETED_ACTION ) { + $actiontext = wfMsgHtml('rev-deleted-event'); + } else { + $actiontext = LogPage::actionText( $row->rc_log_type, $row->rc_log_action, + $titleObj, $wgUser->getSkin(), LogPage::extractParams($row->rc_params,true,true) ); + } + } + return self::formatDiffRow( $titleObj, + $row->rc_last_oldid, $row->rc_this_oldid, + $timestamp, + ($row->rc_deleted & Revision::DELETED_COMMENT) ? wfMsgHtml('rev-deleted-comment') : $row->rc_comment, + $actiontext ); + } + + public static function formatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext='' ) { + global $wgFeedDiffCutoff, $wgContLang, $wgUser; + wfProfileIn( __FUNCTION__ ); + + $skin = $wgUser->getSkin(); + # log enties + if( $actiontext ) { + $comment = "$actiontext $comment"; + } + $completeText = '

' . $skin->formatComment( $comment ) . "

\n"; + + //NOTE: Check permissions for anonymous users, not current user. + // No "privileged" version should end up in the cache. + // Most feed readers will not log in anway. + $anon = new User(); + $accErrors = $title->getUserPermissionsErrors( 'read', $anon, true ); + + if( $title->getNamespace() >= 0 && !$accErrors ) { + if( $oldid ) { + wfProfileIn( __FUNCTION__."-dodiff" ); + + $de = new DifferenceEngine( $title, $oldid, $newid ); + #$diffText = $de->getDiff( wfMsg( 'revisionasof', + # $wgContLang->timeanddate( $timestamp ) ), + # wfMsg( 'currentrev' ) ); + $diffText = $de->getDiff( + wfMsg( 'previousrevision' ), // hack + wfMsg( 'revisionasof', + $wgContLang->timeanddate( $timestamp ) ) ); + + + if ( strlen( $diffText ) > $wgFeedDiffCutoff ) { + // Omit large diffs + $diffLink = $title->escapeFullUrl( + 'diff=' . $newid . + '&oldid=' . $oldid ); + $diffText = '' . + htmlspecialchars( wfMsgForContent( 'difference' ) ) . + ''; + } elseif ( $diffText === false ) { + // Error in diff engine, probably a missing revision + $diffText = "

Can't load revision $newid

"; + } else { + // Diff output fine, clean up any illegal UTF-8 + $diffText = UtfNormal::cleanUp( $diffText ); + $diffText = self::applyDiffStyle( $diffText ); + } + wfProfileOut( __FUNCTION__."-dodiff" ); + } else { + $rev = Revision::newFromId( $newid ); + if( is_null( $rev ) ) { + $newtext = ''; + } else { + $newtext = $rev->getText(); + } + $diffText = '

' . wfMsg( 'newpage' ) . '

' . + '
' . nl2br( htmlspecialchars( $newtext ) ) . '
'; + } + $completeText .= $diffText; + } + + wfProfileOut( __FUNCTION__ ); + return $completeText; + } + + /** + * Hacky application of diff styles for the feeds. + * Might be 'cleaner' to use DOM or XSLT or something, + * but *gack* it's a pain in the ass. + * + * @param $text String: + * @return string + * @private + */ + public static function applyDiffStyle( $text ) { + $styles = array( + 'diff' => 'background-color: white; color:black;', + 'diff-otitle' => 'background-color: white; color:black;', + 'diff-ntitle' => 'background-color: white; color:black;', + 'diff-addedline' => 'background: #cfc; color:black; font-size: smaller;', + 'diff-deletedline' => 'background: #ffa; color:black; font-size: smaller;', + 'diff-context' => 'background: #eee; color:black; font-size: smaller;', + 'diffchange' => 'color: red; font-weight: bold; text-decoration: none;', + ); + + foreach( $styles as $class => $style ) { + $text = preg_replace( "/(<[^>]+)class=(['\"])$class\\2([^>]*>)/", + "\\1style=\"$style\"\\3", $text ); + } + + return $text; + } + +} \ No newline at end of file diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 82ccdb31d7..08217343ab 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -498,20 +498,8 @@ class PageHistory { * @param string $type */ function feed( $type ) { - global $IP; - require_once "$IP/includes/specials/Recentchanges.php"; - - global $wgFeed, $wgFeedClasses; - - if ( !$wgFeed ) { - global $wgOut; - $wgOut->addWikiMsg( 'feed-unavailable' ); - return; - } - - if( !isset( $wgFeedClasses[$type] ) ) { - global $wgOut; - $wgOut->addWikiMsg( 'feed-invalid' ); + global $wgFeedClasses; + if ( !FeedUtils::checkFeedOutput($type) ) { return; } @@ -555,7 +543,7 @@ class PageHistory { function feedItem( $row ) { $rev = new Revision( $row ); $rev->setTitle( $this->mTitle ); - $text = rcFormatDiffRow( $this->mTitle, + $text = FeedUtils::formatDiffRow( $this->mTitle, $this->mTitle->getPreviousRevisionID( $rev->getId() ), $rev->getId(), $rev->getTimestamp(), diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index 7b8748ee11..4e7373a0ed 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -90,7 +90,7 @@ class SpecialPage 'Preferences' => array( 'SpecialPage', 'Preferences' ), 'Watchlist' => array( 'SpecialPage', 'Watchlist' ), - 'Recentchanges' => array( 'IncludableSpecialPage', 'Recentchanges' ), + 'Recentchanges' => 'SpecialRecentchanges', 'Upload' => array( 'SpecialPage', 'Upload' ), 'Imagelist' => array( 'SpecialPage', 'Imagelist' ), 'Newimages' => array( 'IncludableSpecialPage', 'Newimages' ), diff --git a/includes/specials/Recentchanges.php b/includes/specials/Recentchanges.php index 5ee2705846..2c61f1e8a6 100644 --- a/includes/specials/Recentchanges.php +++ b/includes/specials/Recentchanges.php @@ -4,241 +4,269 @@ * @ingroup SpecialPage */ -/** - * Constructor - */ -function wfSpecialRecentchanges( $par, $specialPage ) { - global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol; - global $wgRCShowWatchingUsers, $wgShowUpdatedMarker; - global $wgAllowCategorizedRecentChanges ; - - # Get query parameters - $feedFormat = $wgRequest->getVal( 'feed' ); - - /* Checkbox values can't be true by default, because - * we cannot differentiate between unset and not set at all - */ - $defaults = array( - /* int */ 'days' => $wgUser->getDefaultOption('rcdays'), - /* int */ 'limit' => $wgUser->getDefaultOption('rclimit'), - /* bool */ 'hideminor' => false, - /* bool */ 'hidebots' => true, - /* bool */ 'hideanons' => false, - /* bool */ 'hideliu' => false, - /* bool */ 'hidepatrolled' => false, - /* bool */ 'hidemyself' => false, - /* text */ 'from' => '', - /* text */ 'namespace' => null, - /* bool */ 'invert' => false, - /* bool */ 'categories_any' => false, - ); - - extract($defaults); - - - $days = $wgUser->getOption( 'rcdays', $defaults['days']); - $days = $wgRequest->getInt( 'days', $days ); - - $limit = $wgUser->getOption( 'rclimit', $defaults['limit'] ); - - # list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' ); - $limit = $wgRequest->getInt( 'limit', $limit ); - - /* order of selection: url > preferences > default */ - $hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor') ? true : $defaults['hideminor'] ); - - # As a feed, use limited settings only - if( $feedFormat ) { - global $wgFeedLimit; - $limit = min( $wgFeedLimit, $limit ); - } else { - - $namespace = $wgRequest->getIntOrNull( 'namespace' ); - $invert = $wgRequest->getBool( 'invert', $defaults['invert'] ); - $hidebots = $wgRequest->getBool( 'hidebots', $defaults['hidebots'] ); - $hideanons = $wgRequest->getBool( 'hideanons', $defaults['hideanons'] ); - $hideliu = $wgRequest->getBool( 'hideliu', $defaults['hideliu'] ); - $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', $defaults['hidepatrolled'] ); - $hidemyself = $wgRequest->getBool ( 'hidemyself', $defaults['hidemyself'] ); - $from = $wgRequest->getVal( 'from', $defaults['from'] ); - - # Get query parameters from path - if( $par ) { - $bits = preg_split( '/\s*,\s*/', trim( $par ) ); - foreach ( $bits as $bit ) { - if ( 'hidebots' == $bit ) $hidebots = 1; - if ( 'bots' == $bit ) $hidebots = 0; - if ( 'hideminor' == $bit ) $hideminor = 1; - if ( 'minor' == $bit ) $hideminor = 0; - if ( 'hideliu' == $bit ) $hideliu = 1; - if ( 'hidepatrolled' == $bit ) $hidepatrolled = 1; - if ( 'hideanons' == $bit ) $hideanons = 1; - if ( 'hidemyself' == $bit ) $hidemyself = 1; - - if ( is_numeric( $bit ) ) { - $limit = $bit; - } +class SpecialRecentChanges extends SpecialPage { + public function __construct() { + SpecialPage::SpecialPage( 'Recentchanges' ); + $this->includable( true ); + } - $m = array(); - if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) { - $limit = $m[1]; - } + public function getDefaultOptions() { + global $wgUser; - if ( preg_match( '/^days=(\d+)$/', $bit, $m ) ) { - $days = $m[1]; - } - } + $opts = new FormOptions(); + + $opts->add( 'days', $wgUser->getDefaultOption('rcdays') ); + $opts->add( 'limit', $wgUser->getDefaultOption('rclimit') ); + $opts->add( 'from', '' ); + + $opts->add( 'hideminor', false ); + $opts->add( 'hidebots', true ); + $opts->add( 'hideanons', false ); + $opts->add( 'hideliu', false ); + $opts->add( 'hidepatrolled', false ); + $opts->add( 'hidemyself', false ); + + $opts->add( 'namespace', '', FormOptions::INTNULL ); + $opts->add( 'invert', false ); + + $opts->add( 'categories', '' ); + $opts->add( 'categories_any', false ); + + return $opts; +} + + public function setup( $parameters ) { + global $wgUser, $wgRequest; + + $opts = $this->getDefaultOptions(); + $opts['days'] = $wgUser->getOption( 'rcdays', $opts['days'] ); + $opts['limit'] = $wgUser->getOption( 'rclimit', $opts['limit'] ); + $opts['hideminor'] = $wgUser->getOption( 'hideminor', $opts['hideminor'] ); + $opts->fetchValuesFromRequest( $wgRequest ); + + // Give precedence to subpage syntax + if ( $parameters !== null ) { + $this->parseParameters( $this->par, $opts ); } + + $opts->validateIntBounds( 'limit', 0, 5000 ); + return $opts; } - if ( $limit < 0 || $limit > 5000 ) $limit = $defaults['limit']; + public function feedSetup() { + global $wgFeedLimit, $wgRequest; + $opts = $this->getDefaultOptions(); + $opts->fetchValuesFromRequest( $wgRequest, array( 'days', 'limit', 'hideminor' ) ); + $opts->validateIntBounds( 'limit', 0, $wgFeedLimit ); + return $opts; + } + + public function execute( $parameters ) { + global $wgRequest, $wgOut; + $feedFormat = $wgRequest->getVal( 'feed' ); + + # 10 seconds server-side caching max + $wgOut->setSquidMaxage( 10 ); - # Database connection and caching - $dbr = wfGetDB( DB_SLAVE ); + $lastmod = $this->checkLastModified( $feedFormat ); + if ( !$lastmod ) { + return; + } + + $opts = $feedFormat ? $this->feedSetup() : $this->setup( $parameters ); + $this->setHeaders(); + + // Fetch results, prepare a batch link existence check query + $rows = array(); + $batch = new LinkBatch; + $conds = $this->buildMainQueryConds( $opts ); + $res = $this->doMainQuery( $conds, $opts ); + $dbr = wfGetDB( DB_SLAVE ); + while( $row = $dbr->fetchObject( $res ) ){ + $rows[] = $row; + if ( !$feedFormat ) { + // User page and talk links + $batch->add( NS_USER, $row->rc_user_text ); + $batch->add( NS_USER_TALK, $row->rc_user_text ); + } + + } + $dbr->freeResult( $res ); - $cutoff_unixtime = time() - ( $days * 86400 ); - $cutoff_unixtime = $cutoff_unixtime - ($cutoff_unixtime % 86400); - $cutoff = $dbr->timestamp( $cutoff_unixtime ); - if(preg_match('/^[0-9]{14}$/', $from) and $from > wfTimestamp(TS_MW,$cutoff)) { - $cutoff = $dbr->timestamp($from); - } else { - $from = $defaults['from']; + if ( $feedFormat ) { + $feed = new ChangesFeed( $feedFormat, 'rcfeed' ); + $feedObj = $feed->getFeedObject( + wfMsgForContent( 'recentchanges' ), + wfMsgForContent( 'recentchanges-feed-description' ) + ); + $feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $lastmod ); + } else { + $batch->execute(); + $this->webOutput( $rows, $opts ); + } + } - # 10 seconds server-side caching max - $wgOut->setSquidMaxage( 10 ); + public function parseParameters( $par, FormOptions $opts ) { + $bits = preg_split( '/\s*,\s*/', trim( $par ) ); + foreach ( $bits as $bit ) { + if ( 'hidebots' === $bit ) $opts['hidebots'] = true; + if ( 'bots' === $bit ) $opts['hidebots'] = false; + if ( 'hideminor' === $bit ) $opts['hideminor'] = true; + if ( 'minor' === $bit ) $opts['hideminor'] = false; + if ( 'hideliu' === $bit ) $opts['hideliu'] = true; + if ( 'hidepatrolled' === $bit ) $opts['hidepatrolled'] = true; + if ( 'hideanons' === $bit ) $opts['hideanons'] = true; + if ( 'hidemyself' === $bit ) $opts['hidemyself'] = true; + + if ( is_numeric( $bit ) ) $opts['limit'] = $bit; + + $m = array(); + if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) $opts['limit'] = $m[1]; + if ( preg_match( '/^days=(\d+)$/', $bit, $m ) ) $opts['days'] = $m[1]; + } + } # 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, __FUNCTION__ ); - if ( $feedFormat || !$wgUseRCPatrol ) { - if( $lastmod && $wgOut->checkLastModified( $lastmod ) ){ - # Client cache fresh and headers sent, nothing more to do. - return; + public function checkLastModified( $feedFormat ) { + global $wgUseRCPatrol, $wgOut; + $dbr = wfGetDB( DB_SLAVE ); + $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, __FUNCTION__ ); + if ( $feedFormat || !$wgUseRCPatrol ) { + if( $lastmod && $wgOut->checkLastModified( $lastmod ) ){ + # Client cache fresh and headers sent, nothing more to do. + return false; + } } + return $lastmod; } - # It makes no sense to hide both anons and logged-in users - # Where this occurs, force anons to be shown - $forcebot = false; - if( $hideanons && $hideliu ){ - # Check if the user wants to show bots only - if( $hidebots ){ - $hideanons = 0; - } else { - $forcebot = true; - $hidebots = 0; + public function buildMainQueryConds( FormOptions $opts ) { + global $wgUser; + + $dbr = wfGetDB( DB_SLAVE ); + $conds = array(); + + # It makes no sense to hide both anons and logged-in users + # Where this occurs, force anons to be shown + $forcebot = false; + if( $opts['hideanons'] && $opts['hideliu'] ){ + # Check if the user wants to show bots only + if( $opts['hidebots'] ){ + $opts['hideanons'] = false; + } else { + $forcebot = true; + $opts['hidebots'] = false; + } } - } - # Form WHERE fragments for all the options - $hidem = $hideminor ? 'AND rc_minor = 0' : ''; - $hidem .= $hidebots ? ' AND rc_bot = 0' : ''; - $hidem .= $hideliu && !$forcebot ? ' AND rc_user = 0' : ''; - $hidem .= ($wgUser->useRCPatrol() && $hidepatrolled ) ? ' AND rc_patrolled = 0' : ''; - $hidem .= $hideanons && !$forcebot ? ' AND rc_user != 0' : ''; - $hidem .= $forcebot ? ' AND rc_bot = 1' : ''; + // Calculate cutoff + $cutoff_unixtime = time() - ( $opts['days'] * 86400 ); + $cutoff_unixtime = $cutoff_unixtime - ($cutoff_unixtime % 86400); + $cutoff = $dbr->timestamp( $cutoff_unixtime ); - if( $hidemyself ) { - if( $wgUser->getId() ) { - $hidem .= ' AND rc_user != ' . $wgUser->getId(); + $fromValid = preg_match('/^[0-9]{14}$/', $opts['from']); + if( $fromValid && $opts['from'] > wfTimestamp(TS_MW,$cutoff) ) { + $cutoff = $dbr->timestamp($opts['from']); } else { - $hidem .= ' AND rc_user_text != ' . $dbr->addQuotes( $wgUser->getName() ); + $opts->reset( 'from' ); } + + $conds[] = 'rc_timestamp >= ' . $dbr->addQuotes( $cutoff ); + + + $hidePatrol = $wgUser->useRCPatrol() && $opts['hidepatrolled']; + $hideLoggedInUsers = $opts['hideliu'] && !$forcebot; + $hideAnonymousUsers = $opts['hideanons'] && !$forcebot; + + if ( $opts['hideminor'] ) $conds['rc_minor'] = 0; + if ( $opts['hidebots'] ) $conds['rc_bot'] = 0; + if ( $hidePatrol ) $conds['rc_patrolled'] = 0; + if ( $forcebot ) $conds['rc_bot'] = 1; + if ( $hideLoggedInUsers ) $conds[] = 'rc_user = 0'; + if ( $hideAnonymousUsers ) $conds[] = 'rc_user != 0'; + + if( $opts['hidemyself'] ) { + if( $wgUser->getId() ) { + $conds[] = 'rc_user != ' . $dbr->addQuotes( $wgUser->getId() ); + } else { + $conds[] = 'rc_user_text != ' . $dbr->addQuotes( $wgUser->getName() ); + } + } + + # Namespace filtering + if ( $opts['namespace'] !== '' ) { + if ( !$opts['invert'] ) { + $conds[] = 'rc_namespace = ' . $dbr->addQuotes( $opts['namespace'] ); + } else { + $conds[] = 'rc_namespace != ' . $dbr->addQuotes( $opts['namespace'] ); + } + } + + return $conds; } - // JOIN on watchlist for users - $uid = $wgUser->getId(); - if( $uid ) { - $tables = array( 'recentchanges', 'watchlist' ); - $join_conds = array( 'watchlist' => array('LEFT JOIN',"wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace") ); - } else { + public function doMainQuery( $conds, $opts ) { + global $wgUser; + $tables = array( 'recentchanges' ); $join_conds = array(); - } - - # Namespace filtering - $hidem .= is_null($namespace) ? '' : ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace; - - // Is there either one namespace selected or excluded? - // Also, if this is "all" or main namespace, just use timestamp index. - if( is_null($namespace) || $invert || $namespace == NS_MAIN ) { - $res = $dbr->select( $tables, '*', - array( "rc_timestamp >= '{$cutoff}' {$hidem}" ), - __METHOD__, - array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit, - 'USE INDEX' => array('recentchanges' => 'rc_timestamp') ), - $join_conds ); - // We have a new_namespace_time index! UNION over new=(0,1) and sort result set! - } else { - // New pages - $sqlNew = $dbr->selectSQLText( $tables, '*', - array( 'rc_new' => 1, - "rc_timestamp >= '{$cutoff}' {$hidem}" ), - __METHOD__, - array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit, - 'USE INDEX' => array('recentchanges' => 'new_name_timestamp') ), - $join_conds ); - // Old pages - $sqlOld = $dbr->selectSQLText( $tables, '*', - array( 'rc_new' => 0, - "rc_timestamp >= '{$cutoff}' {$hidem}" ), - __METHOD__, - array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit, - 'USE INDEX' => array('recentchanges' => 'new_name_timestamp') ), - $join_conds ); - # Join the two fast queries, and sort the result set - $sql = "($sqlNew) UNION ($sqlOld) ORDER BY rc_timestamp DESC LIMIT $limit"; - $res = $dbr->query( $sql, __METHOD__ ); - } - - // Fetch results, prepare a batch link existence check query - $rows = array(); - $batch = new LinkBatch; - while( $row = $dbr->fetchObject( $res ) ){ - $rows[] = $row; - if ( !$feedFormat ) { - // User page and talk links - $batch->add( NS_USER, $row->rc_user_text ); - $batch->add( NS_USER_TALK, $row->rc_user_text ); + + $uid = $wgUser->getId(); + $dbr = wfGetDB( DB_SLAVE ); + $limit = $opts['limit']; + $namespace = $opts['namespace']; + $invert = $opts['invert']; + + // JOIN on watchlist for users + if( $wgUser->getId() ) { + $tables[] = 'watchlist'; + $join_conds = array( 'watchlist' => array('LEFT JOIN',"wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace") ); + } + + wfRunHooks('SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts ) ); + + // Is there either one namespace selected or excluded? + // Also, if this is "all" or main namespace, just use timestamp index. + if( is_null($namespace) || $invert || $namespace == NS_MAIN ) { + $res = $dbr->select( $tables, '*', $conds, __METHOD__, + array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit, + 'USE INDEX' => array('recentchanges' => 'rc_timestamp') ), + $join_conds ); + // We have a new_namespace_time index! UNION over new=(0,1) and sort result set! + } else { + // New pages + $sqlNew = $dbr->selectSQLText( $tables, '*', + array( 'rc_new' => 1 ) + $conds, + __METHOD__, + array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit, + 'USE INDEX' => array('recentchanges' => 'new_name_timestamp') ), + $join_conds ); + // Old pages + $sqlOld = $dbr->selectSQLText( $tables, '*', + array( 'rc_new' => 0 ) + $conds, + __METHOD__, + array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit, + 'USE INDEX' => array('recentchanges' => 'new_name_timestamp') ), + $join_conds ); + # Join the two fast queries, and sort the result set + $sql = "($sqlNew) UNION ($sqlOld) ORDER BY rc_timestamp DESC LIMIT $limit"; + $res = $dbr->query( $sql, __METHOD__ ); } + return $res; } - $dbr->freeResult( $res ); - - if( $feedFormat ) { - rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ); - } else { - - # Web output... - - // Run existence checks - $batch->execute(); - $any = $wgRequest->getBool( 'categories_any', $defaults['categories_any']); - - // Output header - if ( !$specialPage->including() ) { - $wgOut->addWikiText( wfMsgForContentNoTrans( "recentchangestext" ) ); - - // Dump everything here - $nondefaults = array(); - - wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'limit', $limit , $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'hideminor', $hideminor, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'hidebots', $hidebots, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'hideanons', $hideanons, $defaults, $nondefaults ); - wfAppendToArrayIfNotDefault( 'hideliu', $hideliu, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'hidepatrolled', $hidepatrolled, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'hidemyself', $hidemyself, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'from', $from, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'namespace', $namespace, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'invert', $invert, $defaults, $nondefaults); - wfAppendToArrayIfNotDefault( 'categories_any', $any, $defaults, $nondefaults); - - // Add end of the texts - $wgOut->addHTML( '
' . rcOptionsPanel( $defaults, $nondefaults ) . "\n" ); - $wgOut->addHTML( rcNamespaceForm( $namespace, $invert, $nondefaults, $any ) . '
'."\n"); + + public function webOutput( $rows, $opts ) { + global $wgOut, $wgUser, $wgRCShowWatchingUsers, $wgShowUpdatedMarker; + global $wgAllowCategorizedRecentChanges; + + $limit = $opts['limit']; + + if ( !$this->including() ) { + // Output options box + $this->doHeader( $opts ); } // And now for the content @@ -247,10 +275,7 @@ function wfSpecialRecentchanges( $par, $specialPage ) { $list = ChangesList::newFromUser( $wgUser ); if ( $wgAllowCategorizedRecentChanges ) { - $categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ; - $categories = str_replace ( "|" , "\n" , $categories ) ; - $categories = explode ( "\n" , $categories ) ; - rcFilterByCategories ( $rows , $categories , $any ) ; + rcFilterByCategories( $rows, $opts ); } $s = $list->beginRecentChangesList(); @@ -259,13 +284,15 @@ function wfSpecialRecentchanges( $par, $specialPage ) { $showWatcherCount = $wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ); $watcherCache = array(); + $dbr = wfGetDB( DB_SLAVE ); + foreach( $rows as $obj ){ if( $limit == 0) { break; } - if ( ! ( $hideminor && $obj->rc_minor ) && - ! ( $hidepatrolled && $obj->rc_patrolled ) ) { + if ( ! ( $opts['hideminor'] && $obj->rc_minor ) && + ! ( $opts['hidepatrolled'] && $obj->rc_patrolled ) ) { $rc = RecentChange::newFromRow( $obj ); $rc->counter = $counter++; @@ -298,171 +325,132 @@ function wfSpecialRecentchanges( $par, $specialPage ) { $s .= $list->endRecentChangesList(); $wgOut->addHTML( $s ); } + + public function doHeader( $opts ) { + global $wgScript, $wgOut; + $wgOut->addWikiText( wfMsgForContentNoTrans( 'recentchangestext' ) ); + + $defaults = $opts->getAllValues(); + $nondefaults = $opts->getChangedValues(); + $opts->consumeValues( array( 'namespace', 'invert' ) ); + + $panel = array(); + $panel[] = rcOptionsPanel( $defaults, $nondefaults ); + $panel[] = '
'; + + $extraOpts = array(); + $extraOpts['namespace'] = $this->namespaceFilterForm( $opts ); + + global $wgAllowCategorizedRecentChanges; + if ( $wgAllowCategorizedRecentChanges ) { + $extraOpts['category'] = $this->categoryFilterForm( $opts ); + } + + wfRunHooks( 'SpecialRecentChangesPanel', array( &$extraOpts, $opts ) ); + $extraOpts['submit'] = Xml::submitbutton( wfMsg('allpagessubmit') ); + + $out = Xml::openElement( 'table' ); + foreach ( $extraOpts as $optionRow ) { + $out .= Xml::openElement( 'tr' ); + if ( is_array($optionRow) ) { + $out .= Xml::tags( 'td', null, $optionRow[0] ); + $out .= Xml::tags( 'td', null, $optionRow[1] ); + } else { + $out .= Xml::tags( 'td', array( 'colspan' => 2 ), $optionRow ); + } + $out .= Xml::closeElement( 'tr' ); + } + $out .= Xml::closeElement( 'table' ); + + $unconsumed = $opts->getUnconsumedValues(); + foreach ( $unconsumed as $key => $value ) { + $out .= Xml::hidden( $key, $value ); + } + + $t = $this->getTitle(); + $out .= Xml::hidden( 'title', $t->getPrefixedText() ); + $form = Xml::tags( 'form', array( 'action' => $wgScript ), $out ); + $panel[] = $form; + $panelString = implode( "\n", $panel ); + + $wgOut->addHTML( + Xml::fieldset( wfMsg( 'recentchanges' ), $panelString, array( 'class' => 'rcoptions' ) ) + ); + } + + /** + * Creates the choose namespace selection + * + * @return string + */ + protected function namespaceFilterForm( FormOptions $opts ) { + $nsSelect = HTMLnamespaceselector( $opts['namespace'], '' ); + $nsLabel = Xml::label( wfMsg('namespace'), 'namespace' ); + $invert = Xml::checkLabel( wfMsg('invert'), 'invert', 'nsinvert', $opts['invert'] ); + return array( $nsLabel, "$nsSelect $invert" ); + } + + protected function categoryFilterForm( FormOptions $opts ) { + list( $label, $input ) = Xml::inputLabelSep( wfMsg('rc_categories'), + 'categories', 'mw-categories', false, $opts['categories'] ); + + $input .= ' ' . Xml::checkLabel( wfMsg('rc_categories_any'), + 'categories_any', 'mw-categories_any', $opts['categories_any'] ); + + return array( $label, $input ); + } + } -function rcFilterByCategories ( &$rows , $categories , $any ) { - if( empty( $categories ) ) { +function rcFilterByCategories ( &$rows, FormOptions $opts ) { + $categories = array_map( 'trim', explode( "|" , $categories ) ); + + if( empty($categories) ) { return; } # Filter categories - $cats = array () ; - foreach ( $categories AS $cat ) { - $cat = trim ( $cat ) ; - if ( $cat == "" ) continue ; - $cats[] = $cat ; + $cats = array(); + foreach ( $opts['categories'] AS $cat ) { + $cat = trim( $cat ); + if ( $cat == "" ) continue; + $cats[] = $cat; } # Filter articles - $articles = array () ; - $a2r = array () ; + $articles = array(); + $a2r = array(); foreach ( $rows AS $k => $r ) { $nt = Title::makeTitle( $r->rc_namespace, $r->rc_title ); - $id = $nt->getArticleID() ; - if ( $id == 0 ) continue ; # Page might have been deleted... - if ( !in_array ( $id , $articles ) ) { - $articles[] = $id ; + $id = $nt->getArticleID(); + if ( $id == 0 ) continue; # Page might have been deleted... + if ( !in_array($id, $articles) ) { + $articles[] = $id; } - if ( !isset ( $a2r[$id] ) ) { - $a2r[$id] = array() ; + if ( !isset($a2r[$id]) ) { + $a2r[$id] = array(); } - $a2r[$id][] = $k ; + $a2r[$id][] = $k; } # Shortcut? - if ( count ( $articles ) == 0 OR count ( $cats ) == 0 ) + if ( !count($articles) || !count($cats) ) return ; # Look up $c = new Categoryfinder ; - $c->seed ( $articles , $cats , $any ? "OR" : "AND" ) ; - $match = $c->run () ; + $c->seed( $articles, $cats, $opts['categories_any'] ? "OR" : "AND" ) ; + $match = $c->run(); # Filter - $newrows = array () ; + $newrows = array(); foreach ( $match AS $id ) { foreach ( $a2r[$id] AS $rev ) { - $k = $rev ; - $newrows[$k] = $rows[$k] ; - } - } - $rows = $newrows ; -} - -function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) { - global $messageMemc, $wgFeedCacheTimeout; - global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode; - global $wgFeed; - - if ( !$wgFeed ) { - global $wgOut; - $wgOut->addWikiMsg( 'feed-unavailable' ); - return; - } - - if( !isset( $wgFeedClasses[$feedFormat] ) ) { - wfHttpError( 500, "Internal Server Error", "Unsupported feed type." ); - return false; - } - - $timekey = wfMemcKey( 'rcfeed', $feedFormat, 'timestamp' ); - $key = wfMemcKey( 'rcfeed', $feedFormat, 'limit', $limit, 'minor', $hideminor ); - - $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchanges' ) . - ' [' . $wgContLanguageCode . ']'; - $feed = new $wgFeedClasses[$feedFormat]( - $feedTitle, - htmlspecialchars( wfMsgForContent( 'recentchanges-feed-description' ) ), - $wgTitle->getFullUrl() ); - - //purge cache if requested - global $wgRequest, $wgUser; - $purge = $wgRequest->getVal( 'action' ) == 'purge'; - if ( $purge && $wgUser->isAllowed('purge') ) { - $messageMemc->delete( $timekey ); - $messageMemc->delete( $key ); - } - - /** - * 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( ( $wgFeedCacheTimeout > 0 ) && ( $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; -} - -/** - * @todo document - * @param $rows Database resource with recentchanges rows - */ -function rcDoOutputFeed( $rows, &$feed ) { - wfProfileIn( __METHOD__ ); - - $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++; + $k = $rev; + $newrows[$k] = $rows[$k]; } } - - 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( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ), - $obj->rc_timestamp, - ($obj->rc_deleted & Revision::DELETED_USER) ? wfMsgHtml('rev-deleted-user') : $obj->rc_user_text, - $talkpage->getFullURL() - ); - $feed->outItem( $item ); - } - $feed->outFooter(); - wfProfileOut( __METHOD__ ); + $rows = $newrows; } /** @@ -624,175 +612,4 @@ function rcOptionsPanel( $defaults, $nondefaults ) { $rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter'), $tl ); return "$note
$rclinks
$rclistfrom"; -} - -/** - * Creates the choose namespace selection - * - * @private - * - * @param $namespace Mixed: the key of the currently selected namespace, empty string - * if there is none - * @param $invert Bool: whether to invert the namespace selection - * @param $nondefaults Array: an array of non default options to be remembered - * @param $categories_any Bool: Default value for the checkbox - * - * @return string - */ -function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) { - global $wgScript, $wgAllowCategorizedRecentChanges, $wgRequest; - $t = SpecialPage::getTitleFor( 'Recentchanges' ); - - $namespaceselect = HTMLnamespaceselector($namespace, ''); - $submitbutton = '\n"; - $invertbox = "'; - - if ( $wgAllowCategorizedRecentChanges ) { - $categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ; - $cb_arr = array( 'type' => 'checkbox', 'name' => 'categories_any', 'value' => "1" ) ; - if ( $categories_any ) $cb_arr['checked'] = "checked" ; - $catbox = "
" ; - $catbox .= wfMsgExt('rc_categories', array('parseinline')) . " "; - $catbox .= wfElement('input', array( 'type' => 'text', 'name' => 'categories', 'value' => $categories)); - $catbox .= "  " ; - $catbox .= wfElement('input', $cb_arr ); - $catbox .= wfMsgExt('rc_categories_any', array('parseinline')); - } else { - $catbox = "" ; - } - - $out = "
\n"; - - foreach ( $nondefaults as $key => $value ) { - if ($key != 'namespace' && $key != 'invert') - $out .= wfElement('input', array( 'type' => 'hidden', 'name' => $key, 'value' => $value)); - } - - $out .= ''; - $out .= " -
- - {$namespaceselect}{$submitbutton}{$invertbox} {$catbox}\n
"; - $out .= '
'; - return $out; -} - - -/** - * Format a diff for the newsfeed - */ -function rcFormatDiff( $row ) { - global $wgUser; - - $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title ); - $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp ); - $actiontext = ''; - if( $row->rc_type == RC_LOG ) { - if( $row->rc_deleted & LogPage::DELETED_ACTION ) { - $actiontext = wfMsgHtml('rev-deleted-event'); - } else { - $actiontext = LogPage::actionText( $row->rc_log_type, $row->rc_log_action, - $titleObj, $wgUser->getSkin(), LogPage::extractParams($row->rc_params,true,true) ); - } - } - return rcFormatDiffRow( $titleObj, - $row->rc_last_oldid, $row->rc_this_oldid, - $timestamp, - ($row->rc_deleted & Revision::DELETED_COMMENT) ? wfMsgHtml('rev-deleted-comment') : $row->rc_comment, - $actiontext ); -} - -function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext='' ) { - global $wgFeedDiffCutoff, $wgContLang, $wgUser; - wfProfileIn( __FUNCTION__ ); - - $skin = $wgUser->getSkin(); - # log enties - if( $actiontext ) { - $comment = "$actiontext $comment"; - } - $completeText = '

' . $skin->formatComment( $comment ) . "

\n"; - - //NOTE: Check permissions for anonymous users, not current user. - // No "privileged" version should end up in the cache. - // Most feed readers will not log in anway. - $anon = new User(); - $accErrors = $title->getUserPermissionsErrors( 'read', $anon, true ); - - if( $title->getNamespace() >= 0 && !$accErrors ) { - if( $oldid ) { - wfProfileIn( __FUNCTION__."-dodiff" ); - - $de = new DifferenceEngine( $title, $oldid, $newid ); - #$diffText = $de->getDiff( wfMsg( 'revisionasof', - # $wgContLang->timeanddate( $timestamp ) ), - # wfMsg( 'currentrev' ) ); - $diffText = $de->getDiff( - wfMsg( 'previousrevision' ), // hack - wfMsg( 'revisionasof', - $wgContLang->timeanddate( $timestamp ) ) ); - - - if ( strlen( $diffText ) > $wgFeedDiffCutoff ) { - // Omit large diffs - $diffLink = $title->escapeFullUrl( - 'diff=' . $newid . - '&oldid=' . $oldid ); - $diffText = '' . - htmlspecialchars( wfMsgForContent( 'difference' ) ) . - ''; - } elseif ( $diffText === false ) { - // Error in diff engine, probably a missing revision - $diffText = "

Can't load revision $newid

"; - } else { - // Diff output fine, clean up any illegal UTF-8 - $diffText = UtfNormal::cleanUp( $diffText ); - $diffText = rcApplyDiffStyle( $diffText ); - } - wfProfileOut( __FUNCTION__."-dodiff" ); - } else { - $rev = Revision::newFromId( $newid ); - if( is_null( $rev ) ) { - $newtext = ''; - } else { - $newtext = $rev->getText(); - } - $diffText = '

' . wfMsg( 'newpage' ) . '

' . - '
' . nl2br( htmlspecialchars( $newtext ) ) . '
'; - } - $completeText .= $diffText; - } - - wfProfileOut( __FUNCTION__ ); - return $completeText; -} - -/** - * Hacky application of diff styles for the feeds. - * Might be 'cleaner' to use DOM or XSLT or something, - * but *gack* it's a pain in the ass. - * - * @param $text String: - * @return string - * @private - */ -function rcApplyDiffStyle( $text ) { - $styles = array( - 'diff' => 'background-color: white; color:black;', - 'diff-otitle' => 'background-color: white; color:black;', - 'diff-ntitle' => 'background-color: white; color:black;', - 'diff-addedline' => 'background: #cfc; color:black; font-size: smaller;', - 'diff-deletedline' => 'background: #ffa; color:black; font-size: smaller;', - 'diff-context' => 'background: #eee; color:black; font-size: smaller;', - 'diffchange' => 'color: red; font-weight: bold; text-decoration: none;', - ); - - foreach( $styles as $class => $style ) { - $text = preg_replace( "/(<[^>]+)class=(['\"])$class\\2([^>]*>)/", - "\\1style=\"$style\"\\3", $text ); - } - - return $text; -} +} \ No newline at end of file diff --git a/includes/specials/Recentchangeslinked.php b/includes/specials/Recentchangeslinked.php index f3101f57ac..73d46f81a4 100644 --- a/includes/specials/Recentchangeslinked.php +++ b/includes/specials/Recentchangeslinked.php @@ -5,9 +5,6 @@ * @ingroup SpecialPage */ -/** - * - */ require_once( 'Recentchanges.php' ); /** @@ -90,14 +87,12 @@ function wfSpecialRecentchangeslinked( $par = NULL ) { $fields .= $uid ? ",wl_user" : ""; // Check if this should be a feed + $feed = false; - global $wgSitename, $wgFeedClasses, $wgContLanguageCode, $wgFeedLimit; + global $wgFeedLimit; $feedFormat = $wgRequest->getVal( 'feed' ); - if( $feedFormat && isset( $wgFeedClasses[$feedFormat] ) ) { - $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchangeslinked-title', $nt->getPrefixedText() ) . - ' [' . $wgContLanguageCode . ']'; - $feed = new $wgFeedClasses[$feedFormat]( $feedTitle, - htmlspecialchars( wfMsgForContent('recentchangeslinked') ), $wgTitle->getFullUrl() ); + if( $feedFormat ) { + $feed = new ChangesFeed( $feedFormat, false ); # Sanity check if( $limit > $wgFeedLimit ) { $limit = $wgFeedLimit; @@ -152,7 +147,12 @@ function wfSpecialRecentchangeslinked( $par = NULL ) { } } $wgOut->disable(); - rcDoOutputFeed( $rchanges, $feed ); + + $feedObj = $feed->getFeedObject( + wfMsgForContent( 'recentchangeslinked-title', $nt->getPrefixedText() ), + wfMsgForContent( 'recentchangeslinked' ) + ); + ChangesFeed::generateFeed( $rchanges, $feedObj ); return; } -- 2.20.1