<?php
-
/**
* Implements Special:Recentchanges
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
* @ingroup SpecialPage
*/
-class SpecialRecentChanges extends SpecialPage {
- public function __construct() {
- parent::__construct( 'Recentchanges' );
- $this->includable( true );
+
+/**
+ * A special page that lists last changes made to the wiki
+ *
+ * @ingroup SpecialPage
+ */
+class SpecialRecentChanges extends IncludableSpecialPage {
+ var $rcOptions, $rcSubpage;
+
+ public function __construct( $name = 'Recentchanges' ) {
+ parent::__construct( $name );
}
/**
$opts->add( 'categories', '' );
$opts->add( 'categories_any', false );
+ $opts->add( 'tagfilter', '' );
return $opts;
}
/**
- * Get a FormOptions object with options as specified by the user
+ * Create a FormOptions object with options as specified by the user
*
* @return FormOptions
*/
}
/**
- * Get a FormOptions object sepcific for feed requests
+ * Create a FormOptions object specific for feed requests and return it
*
* @return FormOptions
*/
public function feedSetup() {
global $wgFeedLimit, $wgRequest;
$opts = $this->getDefaultOptions();
- # Feed is cached on limit,hideminor; other params would randomly not work
- $opts->fetchValuesFromRequest( $wgRequest, array( 'limit', 'hideminor' ) );
+ # Feed is cached on limit,hideminor,namespace; other params would randomly not work
+ $opts->fetchValuesFromRequest( $wgRequest, array( 'limit', 'hideminor', 'namespace' ) );
$opts->validateIntBounds( 'limit', 0, $wgFeedLimit );
return $opts;
}
+ /**
+ * Get the current FormOptions for this request
+ */
+ public function getOptions() {
+ if ( $this->rcOptions === null ) {
+ global $wgRequest;
+ $feedFormat = $wgRequest->getVal( 'feed' );
+ $this->rcOptions = $feedFormat ? $this->feedSetup() : $this->setup( $this->rcSubpage );
+ }
+ return $this->rcOptions;
+ }
+
+
/**
* Main execution point
*
- * @param $parameters string
+ * @param $subpage String
*/
- public function execute( $parameters ) {
+ public function execute( $subpage ) {
global $wgRequest, $wgOut;
+ $this->rcSubpage = $subpage;
$feedFormat = $wgRequest->getVal( 'feed' );
# 10 seconds server-side caching max
return;
}
- $opts = $feedFormat ? $this->feedSetup() : $this->setup( $parameters );
+ $opts = $this->getOptions();
$this->setHeaders();
$this->outputHeader();
// Fetch results, prepare a batch link existence check query
- $rows = array();
$conds = $this->buildMainQueryConds( $opts );
$rows = $this->doMainQuery( $conds, $opts );
if( $rows === false ){
foreach( $rows as $row ) {
$batch->add( NS_USER, $row->rc_user_text );
$batch->add( NS_USER_TALK, $row->rc_user_text );
+ $batch->add( $row->rc_namespace, $row->rc_title );
}
$batch->execute();
}
- $target = isset($opts['target']) ? $opts['target'] : ''; // RCL has targets
if( $feedFormat ) {
- list( $feed, $feedObj ) = $this->getFeedObject( $feedFormat );
- $feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $lastmod, $target );
+ list( $changesFeed, $formatter ) = $this->getFeedObject( $feedFormat );
+ $changesFeed->execute( $formatter, $rows, $lastmod, $opts );
} else {
$this->webOutput( $rows, $opts );
}
/**
* Return an array with a ChangesFeed object and ChannelFeed object
*
- * @return array
+ * @return Array
*/
public function getFeedObject( $feedFormat ){
- $feed = new ChangesFeed( $feedFormat, 'rcfeed' );
- $feedObj = $feed->getFeedObject(
+ $changesFeed = new ChangesFeed( $feedFormat, 'rcfeed' );
+ $formatter = $changesFeed->getFeedObject(
wfMsgForContent( 'recentchanges' ),
wfMsgForContent( 'recentchanges-feed-description' )
);
- return array( $feed, $feedObj );
+ return array( $changesFeed, $formatter );
}
/**
* update the timestamp
*
* @param $feedFormat String
- * @return string or false
+ * @return String or false
*/
public function checkLastModified( $feedFormat ) {
global $wgUseRCPatrol, $wgOut;
$dbr = wfGetDB( DB_SLAVE );
- $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, __FUNCTION__ );
+ $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, __METHOD__ );
if( $feedFormat || !$wgUseRCPatrol ) {
if( $lastmod && $wgOut->checkLastModified( $lastmod ) ) {
# Client cache fresh and headers sent, nothing more to do.
/**
* Process the query
*
- * @param $conds array
+ * @param $conds Array
* @param $opts FormOptions
* @return database result or false (for Recentchangeslinked only)
*/
$tables = array( 'recentchanges' );
$join_conds = array();
+ $query_options = array( 'USE INDEX' => array('recentchanges' => 'rc_timestamp') );
$uid = $wgUser->getId();
$dbr = wfGetDB( DB_SLAVE );
$limit = $opts['limit'];
$namespace = $opts['namespace'];
+ $select = '*';
$invert = $opts['invert'];
// JOIN on watchlist for users
if( $uid ) {
$tables[] = 'watchlist';
- $join_conds = array( 'watchlist' => array('LEFT JOIN',
- "wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace") );
+ $join_conds['watchlist'] = array('LEFT JOIN',
+ "wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace");
+ }
+ if ($wgUser->isAllowed("rollback")) {
+ $tables[] = 'page';
+ $join_conds['page'] = array('LEFT JOIN', 'rc_cur_id=page_id');
+ }
+ if ( !$this->including() ) {
+ // Tag stuff.
+ // Doesn't work when transcluding. See bug 23293
+ $fields = array();
+ // Fields are * in this case, so let the function modify an empty array to keep it happy.
+ ChangeTags::modifyDisplayQuery(
+ $tables, $fields, $conds, $join_conds, $query_options, $opts['tagfilter']
+ );
}
- 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 ) {
+ if ( !wfRunHooks( 'SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts, &$query_options, &$select ) ) )
+ return false;
+
+ // Don't use the new_namespace_time timestamp index if:
+ // (a) "All namespaces" selected
+ // (b) We want all pages NOT in a certain namespaces (inverted)
+ // (c) There is a tag to filter on (use tag index instead)
+ // (d) UNION + sort/limit is not an option for the DBMS
+ if( is_null( $namespace )
+ || ( $invert && !is_null( $namespace ) )
+ || $opts['tagfilter'] != ''
+ || !$dbr->unionSupportsOrderAndLimit() )
+ {
$res = $dbr->select( $tables, '*', $conds, __METHOD__,
- array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit,
- 'USE INDEX' => array('recentchanges' => 'rc_timestamp') ),
+ array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit ) +
+ $query_options,
$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, '*',
+ $sqlNew = $dbr->selectSQLText( $tables, $select,
array( 'rc_new' => 1 ) + $conds,
__METHOD__,
array( 'ORDER BY' => 'rc_timestamp DESC', 'LIMIT' => $limit,
- 'USE INDEX' => array('recentchanges' => 'new_name_timestamp') ),
+ 'USE INDEX' => array('recentchanges' => 'rc_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') ),
+ 'USE INDEX' => array('recentchanges' => 'rc_timestamp') ),
$join_conds );
# Join the two fast queries, and sort the result set
- $sql = "($sqlNew) UNION ($sqlOld) ORDER BY rc_timestamp DESC LIMIT $limit";
+ $sql = $dbr->unionQueries(array($sqlNew, $sqlOld), false).' ORDER BY rc_timestamp DESC';
+ $sql = $dbr->limitResult($sql, $limit, false);
$res = $dbr->query( $sql, __METHOD__ );
}
/**
* Send output to $wgOut, only called if not used feeds
*
- * @param $rows array of database rows
+ * @param $rows Array of database rows
* @param $opts FormOptions
*/
public function webOutput( $rows, $opts ) {
}
// And now for the content
- $wgOut->setSyndicated( true );
+ $wgOut->setFeedAppendQuery( $this->getFeedQuery() );
if( $wgAllowCategorizedRecentChanges ) {
$this->filterByCategories( $rows, $opts );
}
$rc->numberofWatchingusers = $watcherCache[$obj->rc_namespace][$obj->rc_title];
}
- $s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
+ $s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ), $counter );
--$limit;
}
$s .= $list->endRecentChangesList();
$wgOut->addHTML( $s );
}
+ /**
+ * Get the query string to append to feed link URLs.
+ * This is overridden by RCL to add the target parameter
+ */
+ public function getFeedQuery() {
+ return false;
+ }
+
/**
* Return the text to be displayed above the changes
*
$defaults = $opts->getAllValues();
$nondefaults = $opts->getChangedValues();
- $opts->consumeValues( array( 'namespace', 'invert' ) );
+ $opts->consumeValues( array( 'namespace', 'invert', 'tagfilter',
+ 'categories', 'categories_any' ) );
$panel = array();
$panel[] = $this->optionsPanel( $defaults, $nondefaults );
$unconsumed = $opts->getUnconsumedValues();
foreach( $unconsumed as $key => $value ) {
- $out .= Xml::hidden( $key, $value );
+ $out .= Html::hidden( $key, $value );
}
$t = $this->getTitle();
- $out .= Xml::hidden( 'title', $t->getPrefixedText() );
+ $out .= Html::hidden( 'title', $t->getPrefixedText() );
$form = Xml::tags( 'form', array( 'action' => $wgScript ), $out );
$panel[] = $form;
$panelString = implode( "\n", $panel );
* Get options to be displayed in a form
*
* @param $opts FormOptions
- * @return array
+ * @return Array
*/
function getExtraOptions( $opts ){
$extraOpts = array();
$extraOpts['category'] = $this->categoryFilterForm( $opts );
}
+ $tagFilter = ChangeTags::buildTagFilterSelector( $opts['tagfilter'] );
+ if ( count($tagFilter) )
+ $extraOpts['tagfilter'] = $tagFilter;
+
wfRunHooks( 'SpecialRecentChangesPanel', array( &$extraOpts, $opts ) );
return $extraOpts;
}
* Creates the choose namespace selection
*
* @param $opts FormOptions
- * @return string
+ * @return String
*/
protected function namespaceFilterForm( FormOptions $opts ) {
$nsSelect = Xml::namespaceSelector( $opts['namespace'], '' );
* Create a input to filter changes by categories
*
* @param $opts FormOptions
- * @return array
+ * @return Array
*/
protected function categoryFilterForm( FormOptions $opts ) {
list( $label, $input ) = Xml::inputLabelSep( wfMsg('rc_categories'),
/**
* Filter $rows by categories set in $opts
*
- * @param $rows array of database rows
+ * @param $rows Array of database rows
* @param $opts FormOptions
*/
function filterByCategories( &$rows, FormOptions $opts ) {
- $categories = array_map( 'trim', explode( "|" , $opts['categories'] ) );
+ $categories = array_map( 'trim', explode( '|' , $opts['categories'] ) );
- if( empty($categories) ) {
+ if( !count( $categories ) ) {
return;
}
$cats = array();
foreach( $categories as $cat ) {
$cat = trim( $cat );
- if( $cat == "" ) continue;
+ if( $cat == '' ) continue;
$cats[] = $cat;
}
# Filter articles
$articles = array();
$a2r = array();
+ $rowsarr = 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) ) {
+ if( !in_array( $id, $articles ) ) {
$articles[] = $id;
}
- if( !isset($a2r[$id]) ) {
+ if( !isset( $a2r[$id] ) ) {
$a2r[$id] = array();
}
$a2r[$id][] = $k;
+ $rowsarr[$k] = $r;
}
# Shortcut?
- if( !count($articles) || !count($cats) )
+ if( !count( $articles ) || !count( $cats ) )
return ;
# Look up
- $c = new Categoryfinder ;
+ $c = new Categoryfinder;
$c->seed( $articles, $cats, $opts['categories_any'] ? "OR" : "AND" ) ;
$match = $c->run();
foreach( $match AS $id ) {
foreach( $a2r[$id] AS $rev ) {
$k = $rev;
- $newrows[$k] = $rows[$k];
+ $newrows[$k] = $rowsarr[$k];
}
}
$rows = $newrows;
/**
* Makes change an option link which carries all the other options
- * @param $title see Title
- * @param $override
- * @param $options
+ *
+ * @param $title Title
+ * @param $override Array: options to override
+ * @param $options Array: current options
+ * @param $active Boolean: whether to show the link in bold
*/
function makeOptionsLink( $title, $override, $options, $active = false ) {
global $wgUser;
$sk = $wgUser->getSkin();
$params = $override + $options;
- return $sk->link( $this->getTitle(), htmlspecialchars( $title ),
- ( $active ? array( 'style'=>'font-weight: bold;' ) : array() ), $params, array( 'known' ) );
+ if ( $active ) {
+ return $sk->link( $this->getTitle(), '<strong>' . htmlspecialchars( $title ) . '</strong>',
+ array(), $params, array( 'known' ) );
+ } else {
+ return $sk->link( $this->getTitle(), htmlspecialchars( $title ), array() , $params, array( 'known' ) );
+ }
}
/**
* Creates the options panel.
- * @param $defaults array
- * @param $nondefaults array
+ *
+ * @param $defaults Array
+ * @param $nondefaults Array
*/
function optionsPanel( $defaults, $nondefaults ) {
global $wgLang, $wgUser, $wgRCLinkLimits, $wgRCLinkDays;
$options = $nondefaults + $defaults;
$note = '';
- if( !wfEmptyMsg( 'rclegend', wfMsg('rclegend') ) ) {
- $note .= wfMsgExt( 'rclegend', array('parseinline') );
+ if( !wfEmptyMsg( 'rclegend' ) ) {
+ $note .= '<div class="mw-rclegend">' . wfMsgExt( 'rclegend', array('parseinline') ) . "</div>\n";
}
if( $options['from'] ) {
$note .= wfMsgExt( 'rcnotefrom', array( 'parseinline' ),
$wgLang->formatNum( $options['limit'] ),
- $wgLang->timeanddate( $options['from'], true ) ) . '<br />';
+ $wgLang->timeanddate( $options['from'], true ),
+ $wgLang->date( $options['from'], true ),
+ $wgLang->time( $options['from'], true ) ) . '<br />';
}
# Sort data for display and make sure it's unique after we've added user data.
$cl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ),
array( 'limit' => $value ), $nondefaults, $value == $options['limit'] ) ;
}
- $cl = implode( ' | ', $cl );
+ $cl = $wgLang->pipeList( $cl );
// day links, reset 'from' to none
foreach( $wgRCLinkDays as $value ) {
$dl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ),
array( 'days' => $value, 'from' => '' ), $nondefaults, $value == $options['days'] ) ;
}
- $dl = implode( ' | ', $dl );
+ $dl = $wgLang->pipeList( $dl );
// show/hide links
if( $wgUser->useRCPatrol() )
$links[] = wfMsgHtml( 'rcshowhidepatr', $patrLink );
$links[] = wfMsgHtml( 'rcshowhidemine', $myselfLink );
- $hl = implode( ' | ', $links );
+ $hl = $wgLang->pipeList( $links );
// show from this onward link
$now = $wgLang->timeanddate( wfTimestampNow(), true );
dépôts / lhc / web / wiklou.git / blobdiff