2006-11-01 12:07:20 +00:00
|
|
|
<?php
|
2010-02-26 13:18:56 +00:00
|
|
|
/**
|
2010-12-22 20:52:06 +00:00
|
|
|
*
|
2006-11-01 12:07:20 +00:00
|
|
|
*
|
2010-08-07 19:59:42 +00:00
|
|
|
* Created on Oct 16, 2006
|
|
|
|
|
*
|
2012-07-15 20:13:02 +00:00
|
|
|
* Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
|
2006-11-01 12:07:20 +00:00
|
|
|
*
|
|
|
|
|
* 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.,
|
2010-06-21 13:13:32 +00:00
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2006-11-01 12:07:20 +00:00
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
2010-08-07 19:59:42 +00:00
|
|
|
*
|
|
|
|
|
* @file
|
2006-11-01 12:07:20 +00:00
|
|
|
*/
|
|
|
|
|
|
2007-04-20 08:55:14 +00:00
|
|
|
/**
|
2007-05-20 23:41:25 +00:00
|
|
|
* This query action adds a list of a specified user's contributions to the output.
|
2008-04-14 07:45:50 +00:00
|
|
|
*
|
WARNING: HUGE COMMIT
Doxygen documentation update:
* Changed alls @addtogroup to @ingroup. @addtogroup adds the comment to the group description, but doesn't add the file, class, function, ... to the group like @ingroup does. See for example http://svn.wikimedia.org/doc/group__SpecialPage.html where it's impossible to see related files, classes, ... that should belong to that group.
* Added @file to file description, it seems that it should be explicitely decalred for file descriptions, otherwise doxygen will think that the comment document the first class, variabled, function, ... that is in that file.
* Removed some empty comments
* Removed some ?>
Added following groups:
* ExternalStorage
* JobQueue
* MaintenanceLanguage
One more thing: there are still a lot of warnings when generating the doc.
2008-05-20 17:13:28 +00:00
|
|
|
* @ingroup API
|
2007-04-20 08:55:14 +00:00
|
|
|
*/
|
2006-11-01 12:07:20 +00:00
|
|
|
class ApiQueryContributions extends ApiQueryBase {
|
|
|
|
|
|
2014-03-25 17:22:11 +00:00
|
|
|
public function __construct( ApiQuery $query, $moduleName ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
parent::__construct( $query, $moduleName, 'uc' );
|
2006-11-01 12:07:20 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-16 07:47:11 +00:00
|
|
|
private $params, $prefixMode, $userprefix, $multiUserMode, $usernames, $parentLens;
|
2007-05-21 04:34:48 +00:00
|
|
|
private $fld_ids = false, $fld_title = false, $fld_timestamp = false,
|
2013-11-14 13:00:02 +00:00
|
|
|
$fld_comment = false, $fld_parsedcomment = false, $fld_flags = false,
|
|
|
|
|
$fld_patrolled = false, $fld_tags = false, $fld_size = false, $fld_sizediff = false;
|
2007-05-15 03:35:32 +00:00
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
public function execute() {
|
|
|
|
|
// Parse some parameters
|
|
|
|
|
$this->params = $this->extractRequestParams();
|
2007-06-16 00:39:01 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$prop = array_flip( $this->params['prop'] );
|
|
|
|
|
$this->fld_ids = isset( $prop['ids'] );
|
|
|
|
|
$this->fld_title = isset( $prop['title'] );
|
|
|
|
|
$this->fld_comment = isset( $prop['comment'] );
|
2013-04-26 12:18:06 +00:00
|
|
|
$this->fld_parsedcomment = isset( $prop['parsedcomment'] );
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->fld_size = isset( $prop['size'] );
|
2012-06-16 07:47:11 +00:00
|
|
|
$this->fld_sizediff = isset( $prop['sizediff'] );
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->fld_flags = isset( $prop['flags'] );
|
|
|
|
|
$this->fld_timestamp = isset( $prop['timestamp'] );
|
|
|
|
|
$this->fld_patrolled = isset( $prop['patrolled'] );
|
|
|
|
|
$this->fld_tags = isset( $prop['tags'] );
|
2006-11-01 12:07:20 +00:00
|
|
|
|
2014-03-02 18:07:06 +00:00
|
|
|
// Most of this code will use the 'contributions' group DB, which can map to slaves
|
|
|
|
|
// with extra user based indexes or partioning by user. The additional metadata
|
|
|
|
|
// queries should use a regular slave since the lookup pattern is not all by user.
|
|
|
|
|
$dbSecondary = $this->getDB(); // any random slave
|
|
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
// TODO: if the query is going only against the revision table, should this be done?
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->selectNamedDB( 'contributions', DB_SLAVE, 'contributions' );
|
2006-11-01 12:07:20 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( isset( $this->params['userprefix'] ) ) {
|
2008-02-26 16:56:08 +00:00
|
|
|
$this->prefixMode = true;
|
2008-10-18 10:14:02 +00:00
|
|
|
$this->multiUserMode = true;
|
2008-02-26 16:56:08 +00:00
|
|
|
$this->userprefix = $this->params['userprefix'];
|
2010-02-26 13:18:56 +00:00
|
|
|
} else {
|
2008-02-26 16:56:08 +00:00
|
|
|
$this->usernames = array();
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( !is_array( $this->params['user'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->params['user'] = array( $this->params['user'] );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
if ( !count( $this->params['user'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->dieUsage( 'User parameter may not be empty.', 'param_user' );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
foreach ( $this->params['user'] as $u ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->prepareUsername( $u );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2008-02-26 16:56:08 +00:00
|
|
|
$this->prefixMode = false;
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->multiUserMode = ( count( $this->params['user'] ) > 1 );
|
2008-02-26 16:56:08 +00:00
|
|
|
}
|
2011-04-10 21:52:34 +00:00
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
$this->prepareQuery();
|
2006-11-01 12:07:20 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
// Do the actual query.
|
2007-05-20 23:41:25 +00:00
|
|
|
$res = $this->select( __METHOD__ );
|
2006-11-01 12:07:20 +00:00
|
|
|
|
2013-04-19 18:03:05 +00:00
|
|
|
if ( $this->fld_sizediff ) {
|
2012-06-16 07:47:11 +00:00
|
|
|
$revIds = array();
|
|
|
|
|
foreach ( $res as $row ) {
|
2013-04-19 18:03:05 +00:00
|
|
|
if ( $row->rev_parent_id ) {
|
2012-06-16 07:47:11 +00:00
|
|
|
$revIds[] = $row->rev_parent_id;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-02 18:07:06 +00:00
|
|
|
$this->parentLens = Revision::getParentLengths( $dbSecondary, $revIds );
|
2012-06-16 07:47:11 +00:00
|
|
|
$res->rewind(); // reset
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
// Initialise some variables
|
2006-11-01 12:07:20 +00:00
|
|
|
$count = 0;
|
2007-05-20 23:41:25 +00:00
|
|
|
$limit = $this->params['limit'];
|
2006-11-01 12:07:20 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
// Fetch each row
|
2010-06-20 18:48:34 +00:00
|
|
|
foreach ( $res as $row ) {
|
2013-11-14 13:00:02 +00:00
|
|
|
if ( ++$count > $limit ) {
|
2013-11-14 13:58:14 +00:00
|
|
|
// We've reached the one extra which shows that there are
|
|
|
|
|
// additional pages to be had. Stop here...
|
2013-12-24 20:26:47 +00:00
|
|
|
$this->setContinueEnumParameter( 'continue', $this->continueStr( $row ) );
|
2006-11-01 12:07:20 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$vals = $this->extractRowInfo( $row );
|
|
|
|
|
$fit = $this->getResult()->addValue( array( 'query', $this->getModuleName() ), null, $vals );
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( !$fit ) {
|
2013-12-24 20:26:47 +00:00
|
|
|
$this->setContinueEnumParameter( 'continue', $this->continueStr( $row ) );
|
* API: BREAKING CHANGE: (bug 11430) Return fewer results than the limit in some cases to prevent running out of memory
* This means queries could possibly return fewer results than the limit and still set a query-continue
* Add iicontinue, rvcontinue, cicontinue, incontinue, amfrom to faciliate query-continue for these modules
* Implemented by blocking additions to the ApiResult object if they would make it too large
** Important things like query-continue values and warnings are exempt from this check
** RSS feeds and exported XML are also exempted (size-checking them would be too messy)
** Result size is checked against $wgAPIMaxResultSize, which defaults to 8 MB
For those who really care, per-file details follow:
ApiResult.php:
* Introduced ApiResult::$mSize which keeps track of the result size.
* Introduced ApiResult::size() which calculates an array's size
(which is the sum of the strlen()s of its elements).
* ApiResult::addValue() now checks that the result size stays below
$wgAPIMaxResultSize. If the item won't fit, it won't be added and addValue()
will return false. Callers should check the return value and set a
query-continue if it's false.
* Closed the back door that is ApiResult::getData(): callers can't manipulate
the data array directly anymore so they can't bypass the result size limit.
* Added ApiResult::setIndexedTagName_internal() which will call
setIndexedTagName() on an array already in the result. This is needed for the
'new' order of adding results, which means addValue()ing one result at a time
until you hit the limit or run out, then calling this function to set the tag
name.
* Added ApiResult::disableSizeCheck() and enableSizeCheck() which disable and
enable size checking in addValue(). This is used for stuff like query-continue
elements and warnings which shouldn't count towards the result size.
* Added ApiResult::unsetValue() which removes an element from the result and
decreases $mSize.
ApiBase.php:
* Like ApiResult::getData(), ApiBase::getResultData() no longer returns a
reference.
* Use ApiResult::disableSizeCheck() in ApiBase::setWarning()
ApiQueryBase.php:
* Added ApiQueryBase::addPageSubItem(), which adds page subitems one item
at a time.
* addPageSubItem() and addPageSubItems() now return whether the subitem
fit in the result.
* Use ApiResult::disableSizeCheck() in setContinueEnumParameter()
ApiMain.php:
* Use ApiResult::disableSizeCheck() in ApiMain::substituteResultWithError()
* Use getParameter() rather than $mRequest to obtain requestid
DefaultSettings.php:
* Added $wgAPIMaxResultSize, with a default value of 8 MB
ApiQuery*.php:
* Added results one at a time, and set a query-continue if the result is full.
ApiQueryLangLinks.php and friends:
* Migrated from addPageSubItems() to addPageSubItem(). This eliminates the
need for $lastId.
ApiQueryAllLinks.php, ApiQueryWatchlist.php, ApiQueryAllimages.php, ApiQuerySearch.php:
* Renamed $data to something more appropriate ($pageids, $ids or $titles)
ApiQuerySiteinfo.php:
* Abuse siprop as a query-continue parameter and set it to all props that
couldn't be processed.
ApiQueryRandom.php:
* Doesn't do continuations, because the result is supposed to be random.
* Be smart enough to not run the second query if the results of the first
didn't fit.
ApiQueryImageInfo.php, ApiQueryRevisions.php, ApiQueryCategoryInfo.php, ApiQueryInfo.php:
* Added continue parameter which basically skips the first so many items
ApiQueryBacklinks.php:
* Throw the result in a big array first and addValue() that one element at a time if necessary
** This is necessary because the results aren't retrieved in order
* Introduced $this->pageMap to map namespace and title to page ID
* Rewritten extractRowInfo() and extractRedirRowInfo() a little
* Declared all private member variables explicitly
ApiQueryDeletedrevs.php:
* Use a pagemap just like in Backlinks
* Introduce fake page IDs and keep track of them so we know where to add what
** This doesn't change the output format, because the fake page IDs start at 0 and are consecutive
ApiQueryAllmessages.php:
* Add amfrom to facilitate query-continue
ApiQueryUsers.php:
* Rewrite: put the getOtherUsersInfo() code in execute()
2009-02-05 14:30:59 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2006-11-01 12:07:20 +00:00
|
|
|
}
|
|
|
|
|
|
2013-11-14 13:58:14 +00:00
|
|
|
$this->getResult()->setIndexedTagName_internal(
|
|
|
|
|
array( 'query', $this->getModuleName() ),
|
|
|
|
|
'item'
|
|
|
|
|
);
|
2006-11-01 12:07:20 +00:00
|
|
|
}
|
|
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
/**
|
2007-08-13 18:15:35 +00:00
|
|
|
* Validate the 'user' parameter and set the value to compare
|
|
|
|
|
* against `revision`.`rev_user_text`
|
2011-05-28 18:58:51 +00:00
|
|
|
*
|
2014-04-15 18:12:09 +00:00
|
|
|
* @param string $user
|
2007-05-20 23:41:25 +00:00
|
|
|
*/
|
2010-01-11 15:55:52 +00:00
|
|
|
private function prepareUsername( $user ) {
|
|
|
|
|
if ( !is_null( $user ) && $user !== '' ) {
|
2007-08-13 18:15:35 +00:00
|
|
|
$name = User::isIP( $user )
|
|
|
|
|
? $user
|
|
|
|
|
: User::getCanonicalName( $user, 'valid' );
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $name === false ) {
|
2007-08-13 18:15:35 +00:00
|
|
|
$this->dieUsage( "User name {$user} is not valid", 'param_user' );
|
|
|
|
|
} else {
|
2008-02-05 15:40:58 +00:00
|
|
|
$this->usernames[] = $name;
|
2007-08-13 18:15:35 +00:00
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
$this->dieUsage( 'User parameter may not be empty', 'param_user' );
|
|
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
}
|
2008-04-14 07:45:50 +00:00
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
/**
|
|
|
|
|
* Prepares the query and returns the limit of rows requested
|
|
|
|
|
*/
|
|
|
|
|
private function prepareQuery() {
|
2009-01-19 16:04:33 +00:00
|
|
|
// We're after the revision table, and the corresponding page
|
|
|
|
|
// row for anything we retrieve. We may also need the
|
2009-11-01 10:42:41 +00:00
|
|
|
// recentchanges row and/or tag summary row.
|
2011-10-26 23:27:01 +00:00
|
|
|
$user = $this->getUser();
|
2010-01-11 15:55:52 +00:00
|
|
|
$tables = array( 'page', 'revision' ); // Order may change
|
|
|
|
|
$this->addWhere( 'page_id=rev_page' );
|
2009-01-19 16:04:33 +00:00
|
|
|
|
2008-10-18 10:14:02 +00:00
|
|
|
// Handle continue parameter
|
2013-12-24 20:26:47 +00:00
|
|
|
if ( !is_null( $this->params['continue'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$continue = explode( '|', $this->params['continue'] );
|
2012-05-16 17:22:36 +00:00
|
|
|
$db = $this->getDB();
|
2013-12-24 20:26:47 +00:00
|
|
|
if ( $this->multiUserMode ) {
|
|
|
|
|
$this->dieContinueUsageIf( count( $continue ) != 3 );
|
|
|
|
|
$encUser = $db->addQuotes( array_shift( $continue ) );
|
|
|
|
|
} else {
|
|
|
|
|
$this->dieContinueUsageIf( count( $continue ) != 2 );
|
|
|
|
|
}
|
|
|
|
|
$encTS = $db->addQuotes( $db->timestamp( $continue[0] ) );
|
|
|
|
|
$encId = (int)$continue[1];
|
|
|
|
|
$this->dieContinueUsageIf( $encId != $continue[1] );
|
2010-01-11 15:55:52 +00:00
|
|
|
$op = ( $this->params['dir'] == 'older' ? '<' : '>' );
|
2013-12-24 20:26:47 +00:00
|
|
|
if ( $this->multiUserMode ) {
|
|
|
|
|
$this->addWhere(
|
|
|
|
|
"rev_user_text $op $encUser OR " .
|
|
|
|
|
"(rev_user_text = $encUser AND " .
|
|
|
|
|
"(rev_timestamp $op $encTS OR " .
|
|
|
|
|
"(rev_timestamp = $encTS AND " .
|
|
|
|
|
"rev_id $op= $encId)))"
|
|
|
|
|
);
|
|
|
|
|
} else {
|
|
|
|
|
$this->addWhere(
|
|
|
|
|
"rev_timestamp $op $encTS OR " .
|
|
|
|
|
"(rev_timestamp = $encTS AND " .
|
|
|
|
|
"rev_id $op= $encId)"
|
|
|
|
|
);
|
|
|
|
|
}
|
2008-10-18 10:14:02 +00:00
|
|
|
}
|
2008-04-14 07:45:50 +00:00
|
|
|
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
// Don't include any revisions where we're not supposed to be able to
|
|
|
|
|
// see the username.
|
|
|
|
|
if ( !$user->isAllowed( 'deletedhistory' ) ) {
|
|
|
|
|
$bitmask = Revision::DELETED_USER;
|
2014-06-12 22:18:51 +00:00
|
|
|
} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
$bitmask = Revision::DELETED_USER | Revision::DELETED_RESTRICTED;
|
|
|
|
|
} else {
|
|
|
|
|
$bitmask = 0;
|
|
|
|
|
}
|
|
|
|
|
if ( $bitmask ) {
|
|
|
|
|
$this->addWhere( $this->getDB()->bitAnd( 'rev_deleted', $bitmask ) . " != $bitmask" );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
|
2008-02-05 15:40:58 +00:00
|
|
|
// We only want pages by the specified users.
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->prefixMode ) {
|
2013-11-14 13:58:14 +00:00
|
|
|
$this->addWhere( 'rev_user_text' .
|
|
|
|
|
$this->getDB()->buildLike( $this->userprefix, $this->getDB()->anyString() ) );
|
2010-02-26 13:18:56 +00:00
|
|
|
} else {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'rev_user_text', $this->usernames );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
// ... and in the specified timeframe.
|
2008-04-10 17:18:27 +00:00
|
|
|
// Ensure the same sort order for rev_user_text and rev_timestamp
|
|
|
|
|
// so our query is indexed
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->multiUserMode ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereRange( 'rev_user_text', $this->params['dir'], null, null );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2011-10-06 20:46:24 +00:00
|
|
|
$this->addTimestampWhereRange( 'rev_timestamp',
|
2007-05-20 23:41:25 +00:00
|
|
|
$this->params['dir'], $this->params['start'], $this->params['end'] );
|
2013-12-24 20:26:47 +00:00
|
|
|
// Include in ORDER BY for uniqueness
|
|
|
|
|
$this->addWhereRange( 'rev_id', $this->params['dir'], null, null );
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'page_namespace', $this->params['namespace'] );
|
2007-07-05 15:09:06 +00:00
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
$show = $this->params['show'];
|
2014-02-26 20:57:58 +00:00
|
|
|
if ( $this->params['toponly'] ) { // deprecated/old param
|
2014-08-14 18:15:23 +00:00
|
|
|
$this->logFeatureUsage( 'list=usercontribs&uctoponly' );
|
2014-02-26 20:57:58 +00:00
|
|
|
$show[] = 'top';
|
|
|
|
|
}
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( !is_null( $show ) ) {
|
|
|
|
|
$show = array_flip( $show );
|
2014-02-26 20:57:58 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( ( isset( $show['minor'] ) && isset( $show['!minor'] ) )
|
2013-11-14 13:00:02 +00:00
|
|
|
|| ( isset( $show['patrolled'] ) && isset( $show['!patrolled'] ) )
|
2014-02-26 20:57:58 +00:00
|
|
|
|| ( isset( $show['top'] ) && isset( $show['!top'] ) )
|
|
|
|
|
|| ( isset( $show['new'] ) && isset( $show['!new'] ) )
|
2013-11-14 13:00:02 +00:00
|
|
|
) {
|
2011-05-19 17:51:16 +00:00
|
|
|
$this->dieUsageMsg( 'show' );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2010-01-11 15:55:52 +00:00
|
|
|
|
|
|
|
|
$this->addWhereIf( 'rev_minor_edit = 0', isset( $show['!minor'] ) );
|
|
|
|
|
$this->addWhereIf( 'rev_minor_edit != 0', isset( $show['minor'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_patrolled = 0', isset( $show['!patrolled'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_patrolled != 0', isset( $show['patrolled'] ) );
|
2014-02-26 20:57:58 +00:00
|
|
|
$this->addWhereIf( 'rev_id != page_latest', isset( $show['!top'] ) );
|
|
|
|
|
$this->addWhereIf( 'rev_id = page_latest', isset( $show['top'] ) );
|
|
|
|
|
$this->addWhereIf( 'rev_parent_id != 0', isset( $show['!new'] ) );
|
|
|
|
|
$this->addWhereIf( 'rev_parent_id = 0', isset( $show['new'] ) );
|
2007-05-20 23:41:25 +00:00
|
|
|
}
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addOption( 'LIMIT', $this->params['limit'] + 1 );
|
2010-02-05 04:40:57 +00:00
|
|
|
$index = array( 'revision' => 'usertext_timestamp' );
|
2007-05-20 23:41:25 +00:00
|
|
|
|
2007-05-21 04:34:48 +00:00
|
|
|
// Mandatory fields: timestamp allows request continuation
|
2008-02-05 15:40:58 +00:00
|
|
|
// ns+title checks if the user has access rights for this page
|
2008-04-14 07:45:50 +00:00
|
|
|
// user_text is necessary if multiple users were specified
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addFields( array(
|
2013-12-24 20:26:47 +00:00
|
|
|
'rev_id',
|
2007-05-21 04:34:48 +00:00
|
|
|
'rev_timestamp',
|
|
|
|
|
'page_namespace',
|
|
|
|
|
'page_title',
|
2010-08-28 01:09:21 +00:00
|
|
|
'rev_user',
|
2008-02-05 15:40:58 +00:00
|
|
|
'rev_user_text',
|
2009-04-22 09:21:33 +00:00
|
|
|
'rev_deleted'
|
2010-01-11 15:55:52 +00:00
|
|
|
) );
|
2010-02-26 13:18:56 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( isset( $show['patrolled'] ) || isset( $show['!patrolled'] ) ||
|
2013-11-14 13:00:02 +00:00
|
|
|
$this->fld_patrolled
|
|
|
|
|
) {
|
2011-10-26 23:27:01 +00:00
|
|
|
if ( !$user->useRCPatrol() && !$user->useNPPatrol() ) {
|
2013-11-14 13:58:14 +00:00
|
|
|
$this->dieUsage(
|
|
|
|
|
'You need the patrol right to request the patrolled flag',
|
|
|
|
|
'permissiondenied'
|
|
|
|
|
);
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2010-07-23 07:33:40 +00:00
|
|
|
|
2009-02-04 23:19:18 +00:00
|
|
|
// Use a redundant join condition on both
|
|
|
|
|
// timestamp and ID so we can use the timestamp
|
|
|
|
|
// index
|
2009-02-09 14:07:18 +00:00
|
|
|
$index['recentchanges'] = 'rc_user_text';
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( isset( $show['patrolled'] ) || isset( $show['!patrolled'] ) ) {
|
2009-02-09 14:07:18 +00:00
|
|
|
// Put the tables in the right order for
|
|
|
|
|
// STRAIGHT_JOIN
|
2010-01-11 15:55:52 +00:00
|
|
|
$tables = array( 'revision', 'recentchanges', 'page' );
|
|
|
|
|
$this->addOption( 'STRAIGHT_JOIN' );
|
|
|
|
|
$this->addWhere( 'rc_user_text=rev_user_text' );
|
|
|
|
|
$this->addWhere( 'rc_timestamp=rev_timestamp' );
|
|
|
|
|
$this->addWhere( 'rc_this_oldid=rev_id' );
|
2010-02-26 13:18:56 +00:00
|
|
|
} else {
|
2009-02-09 14:07:18 +00:00
|
|
|
$tables[] = 'recentchanges';
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addJoinConds( array( 'recentchanges' => array(
|
2009-02-04 23:19:18 +00:00
|
|
|
'LEFT JOIN', array(
|
2009-02-09 14:07:18 +00:00
|
|
|
'rc_user_text=rev_user_text',
|
2009-02-04 23:19:18 +00:00
|
|
|
'rc_timestamp=rev_timestamp',
|
2010-01-11 15:55:52 +00:00
|
|
|
'rc_this_oldid=rev_id' ) ) ) );
|
2009-02-09 14:07:18 +00:00
|
|
|
}
|
2009-01-19 16:04:33 +00:00
|
|
|
}
|
2008-04-14 07:45:50 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addTables( $tables );
|
|
|
|
|
$this->addFieldsIf( 'rev_page', $this->fld_ids );
|
|
|
|
|
$this->addFieldsIf( 'page_latest', $this->fld_flags );
|
2010-02-26 13:18:56 +00:00
|
|
|
// $this->addFieldsIf( 'rev_text_id', $this->fld_ids ); // Should this field be exposed?
|
2010-01-31 23:06:35 +00:00
|
|
|
$this->addFieldsIf( 'rev_comment', $this->fld_comment || $this->fld_parsedcomment );
|
2012-07-07 13:16:56 +00:00
|
|
|
$this->addFieldsIf( 'rev_len', $this->fld_size || $this->fld_sizediff );
|
2012-06-16 07:47:11 +00:00
|
|
|
$this->addFieldsIf( 'rev_minor_edit', $this->fld_flags );
|
2013-04-23 21:01:32 +00:00
|
|
|
$this->addFieldsIf( 'rev_parent_id', $this->fld_flags || $this->fld_sizediff || $this->fld_ids );
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addFieldsIf( 'rc_patrolled', $this->fld_patrolled );
|
2010-02-26 13:18:56 +00:00
|
|
|
|
|
|
|
|
if ( $this->fld_tags ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addTables( 'tag_summary' );
|
2013-11-14 13:58:14 +00:00
|
|
|
$this->addJoinConds(
|
|
|
|
|
array( 'tag_summary' => array( 'LEFT JOIN', array( 'rev_id=ts_rev_id' ) ) )
|
|
|
|
|
);
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addFields( 'ts_tags' );
|
2009-11-01 10:42:41 +00:00
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
2010-01-30 12:09:28 +00:00
|
|
|
if ( isset( $this->params['tag'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addTables( 'change_tag' );
|
2013-11-14 13:58:14 +00:00
|
|
|
$this->addJoinConds(
|
|
|
|
|
array( 'change_tag' => array( 'INNER JOIN', array( 'rev_id=ct_rev_id' ) ) )
|
|
|
|
|
);
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'ct_tag', $this->params['tag'] );
|
2009-11-01 10:42:41 +00:00
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
2010-02-03 23:30:19 +00:00
|
|
|
$this->addOption( 'USE INDEX', $index );
|
2007-05-20 23:41:25 +00:00
|
|
|
}
|
2008-04-14 07:45:50 +00:00
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
/**
|
|
|
|
|
* Extract fields from the database row and append them to a result array
|
2011-09-21 16:36:43 +00:00
|
|
|
*
|
2014-07-03 19:29:02 +00:00
|
|
|
* @param stdClass $row
|
2011-09-21 16:36:43 +00:00
|
|
|
* @return array
|
2007-05-20 23:41:25 +00:00
|
|
|
*/
|
2010-01-11 15:55:52 +00:00
|
|
|
private function extractRowInfo( $row ) {
|
2007-05-20 23:41:25 +00:00
|
|
|
$vals = array();
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
$anyHidden = false;
|
|
|
|
|
|
|
|
|
|
if ( $row->rev_deleted & Revision::DELETED_TEXT ) {
|
|
|
|
|
$vals['texthidden'] = '';
|
|
|
|
|
$anyHidden = true;
|
|
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
// Any rows where we can't view the user were filtered out in the query.
|
2010-08-28 01:09:21 +00:00
|
|
|
$vals['userid'] = $row->rev_user;
|
2008-02-05 15:40:58 +00:00
|
|
|
$vals['user'] = $row->rev_user_text;
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $row->rev_deleted & Revision::DELETED_USER ) {
|
2009-04-22 09:21:33 +00:00
|
|
|
$vals['userhidden'] = '';
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
$anyHidden = true;
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $this->fld_ids ) {
|
|
|
|
|
$vals['pageid'] = intval( $row->rev_page );
|
|
|
|
|
$vals['revid'] = intval( $row->rev_id );
|
2010-02-26 13:18:56 +00:00
|
|
|
// $vals['textid'] = intval( $row->rev_text_id ); // todo: Should this field be exposed?
|
2013-04-23 21:01:32 +00:00
|
|
|
|
|
|
|
|
if ( !is_null( $row->rev_parent_id ) ) {
|
|
|
|
|
$vals['parentid'] = intval( $row->rev_parent_id );
|
|
|
|
|
}
|
2007-05-21 04:34:48 +00:00
|
|
|
}
|
2008-04-14 07:45:50 +00:00
|
|
|
|
2010-02-01 15:36:14 +00:00
|
|
|
$title = Title::makeTitle( $row->page_namespace, $row->page_title );
|
2010-01-31 23:06:35 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->fld_title ) {
|
2010-02-01 15:36:14 +00:00
|
|
|
ApiQueryBase::addTitleInfo( $vals, $title );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->fld_timestamp ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$vals['timestamp'] = wfTimestamp( TS_ISO_8601, $row->rev_timestamp );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $this->fld_flags ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $row->rev_parent_id == 0 && !is_null( $row->rev_parent_id ) ) {
|
2007-05-20 23:41:25 +00:00
|
|
|
$vals['new'] = '';
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
if ( $row->rev_minor_edit ) {
|
2007-05-20 23:41:25 +00:00
|
|
|
$vals['minor'] = '';
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
if ( $row->page_latest == $row->rev_id ) {
|
2008-07-09 11:44:49 +00:00
|
|
|
$vals['top'] = '';
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
}
|
|
|
|
|
|
2010-02-01 15:36:14 +00:00
|
|
|
if ( ( $this->fld_comment || $this->fld_parsedcomment ) && isset( $row->rev_comment ) ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $row->rev_deleted & Revision::DELETED_COMMENT ) {
|
2009-04-22 09:21:33 +00:00
|
|
|
$vals['commenthidden'] = '';
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
$anyHidden = true;
|
|
|
|
|
}
|
2014-02-05 10:20:17 +00:00
|
|
|
|
|
|
|
|
$userCanView = Revision::userCanBitfield(
|
|
|
|
|
$row->rev_deleted,
|
|
|
|
|
Revision::DELETED_COMMENT, $this->getUser()
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if ( $userCanView ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->fld_comment ) {
|
2010-01-31 23:06:35 +00:00
|
|
|
$vals['comment'] = $row->rev_comment;
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
|
2010-01-31 23:06:35 +00:00
|
|
|
if ( $this->fld_parsedcomment ) {
|
2011-09-16 19:35:14 +00:00
|
|
|
$vals['parsedcomment'] = Linker::formatComment( $row->rev_comment, $title );
|
2010-01-31 23:06:35 +00:00
|
|
|
}
|
|
|
|
|
}
|
2009-04-22 09:21:33 +00:00
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->fld_patrolled && $row->rc_patrolled ) {
|
2009-01-19 16:04:33 +00:00
|
|
|
$vals['patrolled'] = '';
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( $this->fld_size && !is_null( $row->rev_len ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$vals['size'] = intval( $row->rev_len );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2009-01-19 16:04:33 +00:00
|
|
|
|
2013-11-14 13:58:14 +00:00
|
|
|
if ( $this->fld_sizediff
|
|
|
|
|
&& !is_null( $row->rev_len )
|
|
|
|
|
&& !is_null( $row->rev_parent_id )
|
|
|
|
|
) {
|
|
|
|
|
$parentLen = isset( $this->parentLens[$row->rev_parent_id] )
|
|
|
|
|
? $this->parentLens[$row->rev_parent_id]
|
|
|
|
|
: 0;
|
2012-06-16 07:47:11 +00:00
|
|
|
$vals['sizediff'] = intval( $row->rev_len - $parentLen );
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $this->fld_tags ) {
|
|
|
|
|
if ( $row->ts_tags ) {
|
|
|
|
|
$tags = explode( ',', $row->ts_tags );
|
|
|
|
|
$this->getResult()->setIndexedTagName( $tags, 'tag' );
|
2009-11-01 10:42:41 +00:00
|
|
|
$vals['tags'] = $tags;
|
|
|
|
|
} else {
|
|
|
|
|
$vals['tags'] = array();
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
Improve API query RevDel handling
* ApiQueryDeletedrevs, ApiQueryFilearchive, ApiQueryRecentChanges, and
ApiQueryWatchlist will now return entires where fields have been
revision-deleted. "Hidden" indicators will be provided as appropriate.
* ApiQueryImageInfo, ApiQueryLogEvents, ApiQueryRevisions,
ApiQueryContributions will now return field values in addition to the
"hidden" indicators when the requesting user has the necessary rights.
* Modules that return "hidden" indicators will now also return a
"suppressed" indicator.
* ApiQueryImageInfo will now return info for DELETED_FILE file revisions
if the requesting user has the 'deletedtext' right.
* ApiQueryLogEvents, when searching by user or title, will now return
entries where the user or action are revision-deleted if the
requesting user has the 'deletedhistory' right.
* ApiQueryContributions now uses the correct user rights rather than
'hideuser' to determine when to show contributions where the username
was revision-deleted.
* ApiQueryContributions will now indicate when the revision text is
hidden.
* Fix a bug in ApiQueryDeletedrevs found during testing where specifying
the "content" prop along with the "tags" prop or "drtag" parameter
would cause an SQL error.
* Fix various PHP warnings in ApiQueryFilearchive caused by the lack of
ArchivedFile::selectFields() fields.
* ApiQueryImageInfo::getInfo's $metadataOpts parameter has been renamed
$opts, and now may have an option to indicate the user to use for
RevDel visibility checks.
* ApiQueryWatchlist now properly uses the actual user's rights for
checking whether wlprop=patrol is allowed, rather than using the
wlowner's rights.
Bug: 27747
Bug: 27748
Bug: 28261
Bug: 34926
Bug: 48966
Change-Id: Idec2199976f460e1c73a26d0717e9fc4ab8042bb
2013-12-18 21:58:39 +00:00
|
|
|
if ( $anyHidden && $row->rev_deleted & Revision::DELETED_RESTRICTED ) {
|
|
|
|
|
$vals['suppressed'] = '';
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-20 23:41:25 +00:00
|
|
|
return $vals;
|
|
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
|
|
|
|
private function continueStr( $row ) {
|
2013-12-24 20:26:47 +00:00
|
|
|
if ( $this->multiUserMode ) {
|
|
|
|
|
return "$row->rev_user_text|$row->rev_timestamp|$row->rev_id";
|
|
|
|
|
} else {
|
|
|
|
|
return "$row->rev_timestamp|$row->rev_id";
|
|
|
|
|
}
|
2008-10-18 10:14:02 +00:00
|
|
|
}
|
2007-05-20 23:41:25 +00:00
|
|
|
|
2010-07-23 07:17:56 +00:00
|
|
|
public function getCacheMode( $params ) {
|
|
|
|
|
// This module provides access to deleted revisions and patrol flags if
|
|
|
|
|
// the requester is logged in
|
|
|
|
|
return 'anon-public-user-private';
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-28 19:05:26 +00:00
|
|
|
public function getAllowedParams() {
|
2010-02-26 13:18:56 +00:00
|
|
|
return array(
|
|
|
|
|
'limit' => array(
|
|
|
|
|
ApiBase::PARAM_DFLT => 10,
|
|
|
|
|
ApiBase::PARAM_TYPE => 'limit',
|
|
|
|
|
ApiBase::PARAM_MIN => 1,
|
|
|
|
|
ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
|
|
|
|
|
ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
|
2006-11-01 12:07:20 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'start' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => 'timestamp'
|
2006-11-01 12:07:20 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'end' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => 'timestamp'
|
2006-11-01 12:07:20 +00:00
|
|
|
),
|
2014-09-18 17:38:23 +00:00
|
|
|
'continue' => array(
|
|
|
|
|
ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
|
|
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'user' => array(
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true
|
2007-05-19 04:26:08 +00:00
|
|
|
),
|
2008-02-26 16:56:08 +00:00
|
|
|
'userprefix' => null,
|
2010-02-26 13:18:56 +00:00
|
|
|
'dir' => array(
|
|
|
|
|
ApiBase::PARAM_DFLT => 'older',
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
2006-11-01 12:07:20 +00:00
|
|
|
'newer',
|
|
|
|
|
'older'
|
2014-09-18 17:38:23 +00:00
|
|
|
),
|
|
|
|
|
ApiBase::PARAM_HELP_MSG => 'api-help-param-direction',
|
2007-05-20 23:41:25 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'namespace' => array(
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_TYPE => 'namespace'
|
2007-07-05 15:09:06 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'prop' => array(
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_DFLT => 'ids|title|timestamp|comment|size|flags',
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
2007-05-21 04:34:48 +00:00
|
|
|
'ids',
|
2007-05-20 23:41:25 +00:00
|
|
|
'title',
|
|
|
|
|
'timestamp',
|
|
|
|
|
'comment',
|
2010-01-31 23:06:35 +00:00
|
|
|
'parsedcomment',
|
2009-05-10 09:25:46 +00:00
|
|
|
'size',
|
2012-06-16 07:47:11 +00:00
|
|
|
'sizediff',
|
2009-01-19 16:04:33 +00:00
|
|
|
'flags',
|
2009-02-04 23:19:18 +00:00
|
|
|
'patrolled',
|
2009-11-01 10:42:41 +00:00
|
|
|
'tags'
|
2007-05-20 23:41:25 +00:00
|
|
|
)
|
|
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'show' => array(
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
2007-05-20 23:41:25 +00:00
|
|
|
'minor',
|
|
|
|
|
'!minor',
|
2009-02-04 23:19:18 +00:00
|
|
|
'patrolled',
|
|
|
|
|
'!patrolled',
|
2014-02-26 20:57:58 +00:00
|
|
|
'top',
|
|
|
|
|
'!top',
|
|
|
|
|
'new',
|
|
|
|
|
'!new',
|
2014-09-18 17:38:23 +00:00
|
|
|
),
|
|
|
|
|
ApiBase::PARAM_HELP_MSG => array(
|
|
|
|
|
'apihelp-query+usercontribs-param-show',
|
|
|
|
|
$this->getConfig()->get( 'RCMaxAge' )
|
|
|
|
|
),
|
2007-05-20 23:41:25 +00:00
|
|
|
),
|
2010-02-03 23:30:19 +00:00
|
|
|
'tag' => null,
|
2014-02-26 20:57:58 +00:00
|
|
|
'toponly' => array(
|
|
|
|
|
ApiBase::PARAM_DFLT => false,
|
|
|
|
|
ApiBase::PARAM_DEPRECATED => true,
|
|
|
|
|
),
|
2006-11-01 12:07:20 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-18 17:38:23 +00:00
|
|
|
public function getExamplesMessages() {
|
2010-02-26 13:18:56 +00:00
|
|
|
return array(
|
2014-09-18 17:38:23 +00:00
|
|
|
'action=query&list=usercontribs&ucuser=Example'
|
|
|
|
|
=> 'apihelp-query+usercontribs-example-user',
|
|
|
|
|
'action=query&list=usercontribs&ucuserprefix=192.0.2.'
|
|
|
|
|
=> 'apihelp-query+usercontribs-example-ipprefix',
|
2006-11-01 12:07:20 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-17 17:02:06 +00:00
|
|
|
public function getHelpUrls() {
|
2011-11-28 15:43:11 +00:00
|
|
|
return 'https://www.mediawiki.org/wiki/API:Usercontribs';
|
2011-07-17 17:02:06 +00:00
|
|
|
}
|
2009-05-15 10:42:25 +00:00
|
|
|
}
|