/**
*
*/
-require_once( 'Feed.php' );
require_once( 'ChangesList.php' );
-require_once( 'Revision.php' );
/**
* Constructor
*/
function wfSpecialRecentchanges( $par, $specialPage ) {
- global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol, $wgDBtype;
+ global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
global $wgAllowCategorizedRecentChanges ;
$fname = 'wfSpecialRecentchanges';
extract($defaults);
- $days = $wgUser->getOption( 'rcdays' );
- if ( !$days ) { $days = $defaults['days']; }
+ $days = $wgUser->getOption( 'rcdays', $defaults['days']);
$days = $wgRequest->getInt( 'days', $days );
- $limit = $wgUser->getOption( 'rclimit' );
- if ( !$limit ) { $limit = $defaults['limit']; }
+ $limit = $wgUser->getOption( 'rclimit', $defaults['limit'] );
# list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
$limit = $wgRequest->getInt( 'limit', $limit );
if ( is_numeric( $bit ) ) {
$limit = $bit;
}
-
+
+ $m = array();
if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) {
$limit = $m[1];
}
# Database connection and caching
$dbr =& wfGetDB( DB_SLAVE );
- extract( $dbr->tableNames( 'recentchanges', 'watchlist' ) );
+ list( $recentchanges, $watchlist ) = $dbr->tableNamesN( 'recentchanges', 'watchlist' );
$cutoff_unixtime = time() - ( $days * 86400 );
// Output header
if ( !$specialPage->including() ) {
- $wgOut->addWikiText( wfMsgForContent( "recentchangestext" ) );
+ $wgOut->addWikiText( wfMsgForContentNoTrans( "recentchangestext" ) );
// Dump everything here
$nondefaults = array();
}
// And now for the content
- $sk = $wgUser->getSkin();
$wgOut->setSyndicated( true );
$list = ChangesList::newFromUser( $wgUser );
}
function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
- global $messageMemc, $wgDBname, $wgFeedCacheTimeout;
+ global $messageMemc, $wgFeedCacheTimeout;
global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
if( !isset( $wgFeedClasses[$feedFormat] ) ) {
return false;
}
- $timekey = "$wgDBname:rcfeed:$feedFormat:timestamp";
- $key = "$wgDBname:rcfeed:$feedFormat:limit:$limit:minor:$hideminor";
+ $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( 'recentchangestext' ) ),
+ htmlspecialchars( wfMsgForContent( 'recentchanges-feed-description' ) ),
$wgTitle->getFullUrl() );
/**
$sorted[$n] = $obj;
$n++;
}
- $first = false;
}
foreach( $sorted as $obj ) {
/**
* Makes change an option link which carries all the other options
+ * @param $title @see Title
+ * @param $override
+ * @param $options
*/
function makeOptionsLink( $title, $override, $options ) {
global $wgUser, $wgContLang;
$sk = $wgUser->getSkin();
return $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
- $title, wfArrayToCGI( $override, $options ) );
+ htmlspecialchars( $title ), wfArrayToCGI( $override, $options ) );
}
/**
- * Creates the options panel
+ * Creates the options panel.
+ * @param $defaults
+ * @param $nondefaults
*/
function rcOptionsPanel( $defaults, $nondefaults ) {
global $wgLang, $wgUseRCPatrol;
$options = $nondefaults + $defaults;
if( $options['from'] )
- $note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $options['limit'] ), $wgLang->timeanddate( $options['from'], true ) );
+ $note = wfMsgExt( 'rcnotefrom', array( 'parseinline' ),
+ $wgLang->formatNum( $options['limit'] ),
+ $wgLang->timeanddate( $options['from'], true ) );
else
- $note = wfMsg( 'rcnote', $wgLang->formatNum( $options['limit'] ), $wgLang->formatNum( $options['days'] ) );
+ $note = wfMsgExt( 'rcnote', array( 'parseinline' ),
+ $wgLang->formatNum( $options['limit'] ),
+ $wgLang->formatNum( $options['days'] ),
+ $wgLang->timeAndDate( wfTimestampNow(), true ) );
// limit links
- $cl = '';
$options_limit = array(50, 100, 250, 500);
- $i = 0;
- while ( $i+1 < count($options_limit) ) {
- $cl .= makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) . ' | ' ;
- $i++;
+ foreach( $options_limit as $value ) {
+ $cl[] = makeOptionsLink( $wgLang->formatNum( $value ),
+ array( 'limit' => $value ), $nondefaults) ;
}
- $cl .= makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) ;
+ $cl = implode( ' | ', $cl);
// day links, reset 'from' to none
- $dl = '';
$options_days = array(1, 3, 7, 14, 30);
- $i = 0;
- while ( $i+1 < count($options_days) ) {
- $dl .= makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) . ' | ' ;
- $i++;
+ foreach( $options_days as $value ) {
+ $dl[] = makeOptionsLink( $wgLang->formatNum( $value ),
+ array( 'days' => $value, 'from' => '' ), $nondefaults) ;
}
- $dl .= makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) ;
+ $dl = implode( ' | ', $dl);
+
// show/hide links
$showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ));
$now = $wgLang->timeanddate( wfTimestampNow(), true );
$tl = makeOptionsLink( $now, array( 'from' => wfTimestampNow()), $nondefaults );
- $rclinks = wfMsg( 'rclinks', $cl, $dl, $hl );
- $rclistfrom = wfMsg( 'rclistfrom', $tl );
+ $rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter'),
+ $cl, $dl, $hl );
+ $rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter'), $tl );
return "$note<br />$rclinks<br />$rclistfrom";
}
-/**<F2>
+/**
* Creates the choose namespace selection
*
- * @access private
+ * @private
*
- * @param mixed $namespace The key of the currently selected namespace, empty string
+ * @param $namespace Mixed: the key of the currently selected namespace, empty string
* if there is none
- * @param bool $invert Whether to invert the namespace selection
- * @param array $nondefaults An array of non default options to be remembered
- * @param bool $categories_any Default value for the checkbox
+ * @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 = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
+ $t = SpecialPage::getTitleFor( 'Recentchanges' );
$namespaceselect = HTMLnamespaceselector($namespace, '');
$submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
$categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ;
$cb_arr = array( 'type' => 'checkbox', 'name' => 'categories_any', 'value' => "1" ) ;
if ( $categories_any ) $cb_arr['checked'] = "checked" ;
- $catbox = "<br/>" ;
- $catbox .= wfMsg('rc_categories') . " ";
+ $catbox = "<br />" ;
+ $catbox .= wfMsgExt('rc_categories', array('parseinline')) . " ";
$catbox .= wfElement('input', array( 'type' => 'text', 'name' => 'categories', 'value' => $categories));
$catbox .= " " ;
$catbox .= wfElement('input', $cb_arr );
- $catbox .= wfMsg('rc_categories_any');
+ $catbox .= wfMsgExt('rc_categories_any', array('parseinline'));
} else {
$catbox = "" ;
}
* Format a diff for the newsfeed
*/
function rcFormatDiff( $row ) {
- global $wgFeedDiffCutoff, $wgContLang;
+ $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
+ $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp );
+ return rcFormatDiffRow( $titleObj,
+ $row->rc_last_oldid, $row->rc_this_oldid,
+ $timestamp,
+ $row->rc_comment );
+}
+
+function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment ) {
+ global $wgFeedDiffCutoff, $wgContLang, $wgUser;
$fname = 'rcFormatDiff';
wfProfileIn( $fname );
- require_once( 'DifferenceEngine.php' );
- $completeText = '<p>' . htmlspecialchars( $row->rc_comment ) . "</p>\n";
+ $skin = $wgUser->getSkin();
+ $completeText = '<p>' . $skin->formatComment( $comment ) . "</p>\n";
- if( $row->rc_namespace >= 0 ) {
- if( $row->rc_last_oldid ) {
+ if( $title->getNamespace() >= 0 ) {
+ if( $oldid ) {
wfProfileIn( "$fname-dodiff" );
- $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
- $de = new DifferenceEngine( $titleObj, $row->rc_last_oldid, $row->rc_this_oldid );
- $diffText = $de->getDiff( wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
- wfMsg( 'currentrev' ) );
+ $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 = $titleObj->escapeFullUrl(
- 'diff=' . $row->rc_this_oldid .
- '&oldid=' . $row->rc_last_oldid );
+ $diffLink = $title->escapeFullUrl(
+ 'diff=' . $newid .
+ '&oldid=' . $oldid );
$diffText = '<a href="' .
$diffLink .
'">' .
'</a>';
} elseif ( $diffText === false ) {
// Error in diff engine, probably a missing revision
- $diffText = "<p>Can't load revision $row->rc_this_oldid</p>";
+ $diffText = "<p>Can't load revision $newid</p>";
} else {
// Diff output fine, clean up any illegal UTF-8
$diffText = UtfNormal::cleanUp( $diffText );
}
wfProfileOut( "$fname-dodiff" );
} else {
- $rev = Revision::newFromId( $row->rc_this_oldid );
+ $rev = Revision::newFromId( $newid );
if( is_null( $rev ) ) {
$newtext = '';
} else {
* Might be 'cleaner' to use DOM or XSLT or something,
* but *gack* it's a pain in the ass.
*
- * @param string $text
+ * @param $text String:
* @return string
- * @access private
+ * @private
*/
function rcApplyDiffStyle( $text ) {
$styles = array(
dépôts / lhc / web / wiklou.git / blobdiff