* Constructor
*/
function wfSpecialRecentchanges( $par, $specialPage ) {
- global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
- global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
- global $wgFeedClasses, $wgUseRCPatrol;
+ global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
- global $wgLinkCache;
+ global $wgAllowCategorizedRecentChanges ;
$fname = 'wfSpecialRecentchanges';
# Get query parameters
$feedFormat = $wgRequest->getVal( 'feed' );
+ /* Checkbox values can't be true be 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);
/* 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;
$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 ( '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;
}
}
- $hidem = $hideminor ? 'AND rc_minor=0' : '';
- $hidem .= $hidebots ? ' AND rc_bot=0' : '';
- $hidem .= $hideliu ? ' AND rc_user=0' : '';
- $hidem .= $hidepatrolled ? ' AND rc_patrolled=0' : '';
+ # It makes no sense to hide both anons and logged-in users
+ # Where this occurs, force anons to be shown
+ if( $hideanons && $hideliu )
+ $hideanons = false;
+
+ # Form WHERE fragments for all the options
+ $hidem = $hideminor ? 'AND rc_minor = 0' : '';
+ $hidem .= $hidebots ? ' AND rc_bot = 0' : '';
+ $hidem .= $hideliu ? ' AND rc_user = 0' : '';
+ $hidem .= $hidepatrolled ? ' AND rc_patrolled = 0' : '';
+ $hidem .= $hideanons ? ' AND rc_user != 0' : '';
+
+ if( $hidemyself ) {
+ if( $wgUser->getID() ) {
+ $hidem .= ' AND rc_user != ' . $wgUser->getID();
+ } else {
+ $hidem .= ' AND rc_user_text != ' . $dbr->addQuotes( $wgUser->getName() );
+ }
+ }
+
+ # Namespace filtering
$hidem .= is_null( $namespace ) ? '' : ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace;
// This is the big thing!
$uid = $wgUser->getID();
// Perform query
- $sql2 = "SELECT * FROM $recentchanges " .
+ $sql2 = "SELECT * FROM $recentchanges FORCE INDEX (rc_timestamp) " .
($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
- "WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
+ "WHERE rc_timestamp >= '{$cutoff}' {$hidem} " .
"ORDER BY rc_timestamp DESC";
$sql2 = $dbr->limitResult($sql2, $limit, 0);
$res = $dbr->query( $sql2, $fname );
$batch = new LinkBatch;
while( $row = $dbr->fetchObject( $res ) ){
$rows[] = $row;
- // User page link
- $title = Title::makeTitleSafe( NS_USER, $row->rc_user_text );
- $batch->addObj( $title );
-
- // User talk
- $title = Title::makeTitleSafe( NS_USER_TALK, $row->rc_user_text );
- $batch->addObj( $title );
+ if ( !$feedFormat ) {
+ // User page link
+ $title = Title::makeTitleSafe( NS_USER, $row->rc_user_text );
+ $batch->addObj( $title );
+
+ // User talk
+ $title = Title::makeTitleSafe( NS_USER_TALK, $row->rc_user_text );
+ $batch->addObj( $title );
+ }
}
$dbr->freeResult( $res );
- // Run existence checks
- $batch->execute( $wgLinkCache );
-
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( wfMsgForContent( "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( '<div class="rcoptions">' . rcOptionsPanel( $defaults, $nondefaults ) . "\n" );
- $wgOut->addHTML( rcNamespaceForm( $namespace, $invert, $nondefaults) . '</div>'."\n");
+ $wgOut->addHTML( rcNamespaceForm( $namespace, $invert, $nondefaults, $any ) . '</div>'."\n");
}
// And now for the content
$wgOut->setSyndicated( true );
$list = ChangesList::newFromUser( $wgUser );
+
+ if ( $wgAllowCategorizedRecentChanges ) {
+ $categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ;
+ $categories = str_replace ( "|" , "\n" , $categories ) ;
+ $categories = explode ( "\n" , $categories ) ;
+ rcFilterByCategories ( $rows , $categories , $any ) ;
+ }
$s = $list->beginRecentChangesList();
$counter = 1;
}
}
+function rcFilterByCategories ( &$rows , $categories , $any ) {
+ require_once ( 'Categoryfinder.php' ) ;
+
+ # Filter categories
+ $cats = array () ;
+ foreach ( $categories AS $cat ) {
+ $cat = trim ( $cat ) ;
+ if ( $cat == "" ) continue ;
+ $cats[] = $cat ;
+ }
+
+ # Filter articles
+ $articles = array () ;
+ $a2r = array () ;
+ foreach ( $rows AS $k => $r ) {
+ $nt = Title::newFromText ( $r->rc_title , $r->rc_namespace ) ;
+ $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() ;
+ }
+ $a2r[$id][] = $k ;
+ }
+
+ # Shortcut?
+ if ( count ( $articles ) == 0 OR count ( $cats ) == 0 )
+ return ;
+
+ # Look up
+ $c = new Categoryfinder ;
+ $c->seed ( $articles , $cats , $any ? "OR" : "AND" ) ;
+ $match = $c->run () ;
+
+ # Filter
+ $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, $wgDBname, $wgFeedCacheTimeout;
global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
* gets it quick too.
*/
$cachedFeed = false;
- if( $feedLastmod = $messageMemc->get( $timekey ) ) {
+ 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
}
function rcDoOutputFeed( $rows, &$feed ) {
- global $wgSitename, $wgFeedClasses, $wgContLanguageCode;
+ $fname = 'rcDoOutputFeed';
+ wfProfileIn( $fname );
$feed->outHeader();
$feed->outItem( $item );
}
$feed->outFooter();
+ wfProfileOut( $fname );
}
/**
* Used by Recentchangeslinked
*/
function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall = false, $minorLink = '',
- $botLink = '', $liuLink = '', $patrLink = '' ) {
+ $botLink = '', $liuLink = '', $patrLink = '', $myselfLink = '' ) {
if ($more != '') $more .= '&';
$cl = rcCountLink( 50, $days, $page, $more ) . ' | ' .
rcCountLink( 100, $days, $page, $more ) . ' | ' .
rcDaysLink( $limit, 14, $page, $more ) . ' | ' .
rcDaysLink( $limit, 30, $page, $more ) .
( $doall ? ( ' | ' . rcDaysLink( $limit, 0, $page, $more ) ) : '' );
- $shm = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink );
+ $shm = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink, $myselfLink );
$note = wfMsg( 'rclinks', $cl, $dl, $shm );
return $note;
}
* Makes change an option link which carries all the other options
*/
function makeOptionsLink( $title, $override, $options ) {
- global $wgUser, $wgLang, $wgContLang;
+ global $wgUser, $wgContLang;
$sk = $wgUser->getSkin();
return $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
$title, wfArrayToCGI( $override, $options ) );
array( 'hideminor' => 1-$options['hideminor'] ), $nondefaults);
$botLink = makeOptionsLink( $showhide[1-$options['hidebots']],
array( 'hidebots' => 1-$options['hidebots'] ), $nondefaults);
+ $anonsLink = makeOptionsLink( $showhide[ 1 - $options['hideanons'] ],
+ array( 'hideanons' => 1 - $options['hideanons'] ), $nondefaults );
$liuLink = makeOptionsLink( $showhide[1-$options['hideliu']],
array( 'hideliu' => 1-$options['hideliu'] ), $nondefaults);
$patrLink = makeOptionsLink( $showhide[1-$options['hidepatrolled']],
array( 'hidepatrolled' => 1-$options['hidepatrolled'] ), $nondefaults);
-
- $hl = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink );
-
+ $myselfLink = makeOptionsLink( $showhide[1-$options['hidemyself']],
+ array( 'hidemyself' => 1-$options['hidemyself'] ), $nondefaults);
+ $hl = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink, $myselfLink, $anonsLink );
+
// show from this onward link
$now = $wgLang->timeanddate( wfTimestampNow(), true );
$tl = makeOptionsLink( $now, array( 'from' => wfTimestampNow()), $nondefaults );
* 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
*
* @return string
*/
-function rcNamespaceForm ( $namespace, $invert, $nondefaults ) {
- global $wgContLang, $wgScript;
+function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
+ global $wgScript, $wgAllowCategorizedRecentChanges, $wgRequest;
$t = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
$namespaceselect = HTMLnamespaceselector($namespace, '');
$submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
$invertbox = "<input type='checkbox' name='invert' value='1' id='nsinvert'" . ( $invert ? ' checked="checked"' : '' ) . ' />';
-
+
+ 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 = "<br/>" ;
+ $catbox .= wfMsg('rc_categories') . " ";
+ $catbox .= wfElement('input', array( 'type' => 'text', 'name' => 'categories', 'value' => $categories));
+ $catbox .= " " ;
+ $catbox .= wfElement('input', $cb_arr );
+ $catbox .= wfMsg('rc_categories_any');
+ } else {
+ $catbox = "" ;
+ }
+
$out = "<div class='namespacesettings'><form method='get' action='{$wgScript}'>\n";
foreach ( $nondefaults as $key => $value ) {
if ($key != 'namespace' && $key != 'invert')
$out .= wfElement('input', array( 'type' => 'hidden', 'name' => $key, 'value' => $value));
}
-
+
$out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
$out .= "
<div id='nsselect' class='recentchanges'>
<label for='namespace'>" . wfMsgHtml('namespace') . "</label>
- {$namespaceselect}{$submitbutton}{$invertbox} <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>\n</div>";
+ {$namespaceselect}{$submitbutton}{$invertbox} <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>{$catbox}\n</div>";
$out .= '</form></div>';
return $out;
}
* Format a diff for the newsfeed
*/
function rcFormatDiff( $row ) {
+ global $wgFeedDiffCutoff, $wgContLang;
$fname = 'rcFormatDiff';
wfProfileIn( $fname );
require_once( 'DifferenceEngine.php' );
- $com
ment = '<p>' . htmlspecialchars( $row->rc_comment ) . "</p>\n";
+ $com
pleteText = '<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 );
+ $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' ) );
- global $wgFeedDiffCutoff;
- if( strlen( $newtext ) > $wgFeedDiffCutoff ||
- strlen( $oldtext ) > $wgFeedDiffCutoff ) {
+ if ( strlen( $diffText ) > $wgFeedDiffCutoff ) {
+ // Omit large diffs
$diffLink = $titleObj->escapeFullUrl(
'diff=' . $row->rc_this_oldid .
'&oldid=' . $row->rc_last_oldid );
'">' .
htmlspecialchars( wfMsgForContent( 'difference' ) ) .
'</a>';
+ } elseif ( $diffText === false ) {
+ // Error in diff engine, probably a missing revision
+ $diffText = "<p>Can't load revision $row->rc_this_oldid</p>";
} else {
- $diffText = DifferenceEngine::getDiff( $oldtext, $newtext,
- wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
- wfMsg( 'currentrev' ) );
+ // Diff output fine, clean up any illegal UTF-8
+ $diffText = UtfNormal::cleanUp( $diffText );
+ $diffText = rcApplyDiffStyle( $diffText );
}
wfProfileOut( "$fname-dodiff" );
} else {
+ $rev = Revision::newFromId( $row->rc_this_oldid );
+ if( is_null( $rev ) ) {
+ $newtext = '';
+ } else {
+ $newtext = $rev->getText();
+ }
$diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
'<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
}
-
- wfProfileOut( $fname );
- return $comment . $diffText;
+ $completeText .= $diffText;
}
wfProfileOut( $fname );
- return $comment;
+ 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 string $text
+ * @return string
+ * @access private
+ */
+function rcApplyDiffStyle( $text ) {
+ $styles = array(
+ 'diff' => 'background-color: white;',
+ 'diff-otitle' => 'background-color: white;',
+ 'diff-ntitle' => 'background-color: white;',
+ 'diff-addedline' => 'background: #cfc; font-size: smaller;',
+ 'diff-deletedline' => 'background: #ffa; font-size: smaller;',
+ 'diff-context' => 'background: #eee; font-size: smaller;',
+ 'diffchange' => 'color: red; font-weight: bold;',
+ );
+
+ foreach( $styles as $class => $style ) {
+ $text = preg_replace( "/(<[^>]+)class=(['\"])$class\\2([^>]*>)/",
+ "\\1style=\"$style\"\\3", $text );
+ }
+
+ return $text;
}
?>
dépôts / lhc / web / wiklou.git / blobdiff