2006-10-13 06:13:13 +00:00
|
|
|
<?php
|
2010-02-26 13:18:56 +00:00
|
|
|
/**
|
2010-12-22 20:52:06 +00:00
|
|
|
*
|
2006-10-13 06:13:13 +00:00
|
|
|
*
|
2010-08-07 19:59:42 +00:00
|
|
|
* Created on Sep 25, 2006
|
|
|
|
|
*
|
2012-07-15 20:13:02 +00:00
|
|
|
* Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
|
2006-10-13 06:13:13 +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-10-13 06:13:13 +00:00
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
2010-08-07 19:59:42 +00:00
|
|
|
*
|
|
|
|
|
* @file
|
2006-10-13 06:13:13 +00:00
|
|
|
*/
|
|
|
|
|
|
2007-04-20 08:55:14 +00:00
|
|
|
/**
|
2007-05-20 23:31:44 +00:00
|
|
|
* This query action allows clients to retrieve a list of recently modified pages
|
|
|
|
|
* that are part of the logged-in user's watchlist.
|
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-10-13 06:13:13 +00:00
|
|
|
class ApiQueryWatchlist extends ApiQueryGeneratorBase {
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
public function __construct( $query, $moduleName ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
parent::__construct( $query, $moduleName, 'wl' );
|
2006-10-13 06:13:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function execute() {
|
|
|
|
|
$this->run();
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
public function executeGenerator( $resultPageSet ) {
|
|
|
|
|
$this->run( $resultPageSet );
|
2006-10-13 06:13:13 +00:00
|
|
|
}
|
|
|
|
|
|
2013-11-14 13:31:56 +00:00
|
|
|
private $fld_ids = false, $fld_title = false, $fld_patrol = false,
|
|
|
|
|
$fld_flags = false, $fld_timestamp = false, $fld_user = false,
|
|
|
|
|
$fld_comment = false, $fld_parsedcomment = false, $fld_sizes = false,
|
|
|
|
|
$fld_notificationtimestamp = false, $fld_userid = false,
|
|
|
|
|
$fld_loginfo = false;
|
2008-04-14 07:45:50 +00:00
|
|
|
|
2011-02-19 00:30:18 +00:00
|
|
|
/**
|
|
|
|
|
* @param $resultPageSet ApiPageSet
|
2012-01-12 19:41:18 +00:00
|
|
|
* @return void
|
2011-02-19 00:30:18 +00:00
|
|
|
*/
|
2010-01-11 15:55:52 +00:00
|
|
|
private function run( $resultPageSet = null ) {
|
|
|
|
|
$this->selectNamedDB( 'watchlist', DB_SLAVE, 'watchlist' );
|
2007-05-15 02:16:48 +00:00
|
|
|
|
2008-12-17 16:34:01 +00:00
|
|
|
$params = $this->extractRequestParams();
|
2010-07-23 07:33:40 +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
|
|
|
$user = $this->getUser();
|
|
|
|
|
$wlowner = $this->getWatchlistUser( $params );
|
2009-07-24 01:22:06 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( !is_null( $params['prop'] ) && is_null( $resultPageSet ) ) {
|
|
|
|
|
$prop = array_flip( $params['prop'] );
|
2006-10-16 05:53:07 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->fld_ids = isset( $prop['ids'] );
|
|
|
|
|
$this->fld_title = isset( $prop['title'] );
|
|
|
|
|
$this->fld_flags = isset( $prop['flags'] );
|
|
|
|
|
$this->fld_user = isset( $prop['user'] );
|
2010-08-28 01:09:21 +00:00
|
|
|
$this->fld_userid = isset( $prop['userid'] );
|
2010-01-11 15:55:52 +00:00
|
|
|
$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_timestamp = isset( $prop['timestamp'] );
|
|
|
|
|
$this->fld_sizes = isset( $prop['sizes'] );
|
|
|
|
|
$this->fld_patrol = isset( $prop['patrol'] );
|
2010-01-30 22:48:54 +00:00
|
|
|
$this->fld_notificationtimestamp = isset( $prop['notificationtimestamp'] );
|
2011-05-20 21:47:38 +00:00
|
|
|
$this->fld_loginfo = isset( $prop['loginfo'] );
|
2007-05-20 10:08:40 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $this->fld_patrol ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( !$user->useRCPatrol() && !$user->useNPPatrol() ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->dieUsage( 'patrol property is not available', 'patrol' );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2006-10-16 05:53:07 +00:00
|
|
|
}
|
|
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
|
|
|
|
$this->addFields( array(
|
2013-12-24 20:26:47 +00:00
|
|
|
'rc_id',
|
2010-01-29 14:38:57 +00:00
|
|
|
'rc_namespace',
|
|
|
|
|
'rc_title',
|
2011-05-20 21:47:38 +00:00
|
|
|
'rc_timestamp',
|
|
|
|
|
'rc_type',
|
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
|
|
|
'rc_deleted',
|
2010-01-29 14:38:57 +00:00
|
|
|
) );
|
2006-10-16 05:53:07 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( is_null( $resultPageSet ) ) {
|
2010-02-26 13:18:56 +00:00
|
|
|
$this->addFields( array(
|
2006-10-21 08:26:32 +00:00
|
|
|
'rc_cur_id',
|
2011-06-01 16:26:56 +00:00
|
|
|
'rc_this_oldid',
|
|
|
|
|
'rc_last_oldid',
|
2010-01-11 15:55:52 +00:00
|
|
|
) );
|
|
|
|
|
|
2012-08-05 22:08:35 +00:00
|
|
|
$this->addFieldsIf( array( 'rc_type', 'rc_minor', 'rc_bot' ), $this->fld_flags );
|
2010-08-28 01:09:21 +00:00
|
|
|
$this->addFieldsIf( 'rc_user', $this->fld_user || $this->fld_userid );
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addFieldsIf( 'rc_user_text', $this->fld_user );
|
2010-01-31 23:06:35 +00:00
|
|
|
$this->addFieldsIf( 'rc_comment', $this->fld_comment || $this->fld_parsedcomment );
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addFieldsIf( 'rc_patrolled', $this->fld_patrol );
|
2011-06-01 16:40:59 +00:00
|
|
|
$this->addFieldsIf( array( 'rc_old_len', 'rc_new_len' ), $this->fld_sizes );
|
2010-01-30 22:48:54 +00:00
|
|
|
$this->addFieldsIf( 'wl_notificationtimestamp', $this->fld_notificationtimestamp );
|
2013-11-14 13:31:56 +00:00
|
|
|
$this->addFieldsIf(
|
|
|
|
|
array( 'rc_logid', 'rc_log_type', 'rc_log_action', 'rc_params' ),
|
|
|
|
|
$this->fld_loginfo
|
|
|
|
|
);
|
2010-01-29 14:38:57 +00:00
|
|
|
} elseif ( $params['allrev'] ) {
|
|
|
|
|
$this->addFields( 'rc_this_oldid' );
|
2006-10-14 16:02:42 +00:00
|
|
|
} else {
|
2010-01-29 14:38:57 +00:00
|
|
|
$this->addFields( 'rc_cur_id' );
|
2006-10-14 16:02:42 +00:00
|
|
|
}
|
2006-10-13 06:13:13 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
$this->addTables( array(
|
2011-05-20 21:30:35 +00:00
|
|
|
'recentchanges',
|
2006-10-20 07:10:18 +00:00
|
|
|
'watchlist',
|
2010-01-11 15:55:52 +00:00
|
|
|
) );
|
2006-10-20 07:10:18 +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
|
|
|
$userId = $wlowner->getId();
|
2013-01-12 06:50:48 +00:00
|
|
|
$this->addJoinConds( array( 'watchlist' => array( 'INNER JOIN',
|
2011-05-20 21:30:35 +00:00
|
|
|
array(
|
|
|
|
|
'wl_user' => $userId,
|
|
|
|
|
'wl_namespace=rc_namespace',
|
|
|
|
|
'wl_title=rc_title'
|
2013-11-14 13:00:02 +00:00
|
|
|
)
|
|
|
|
|
) ) );
|
2011-05-20 21:30:35 +00:00
|
|
|
|
2011-03-25 21:05:43 +00:00
|
|
|
$db = $this->getDB();
|
2007-06-02 03:47:34 +00:00
|
|
|
|
2011-11-28 15:43:11 +00:00
|
|
|
$this->addTimestampWhereRange( 'rc_timestamp', $params['dir'],
|
2011-10-06 20:46:24 +00:00
|
|
|
$params['start'], $params['end'] );
|
2013-12-24 20:26:47 +00:00
|
|
|
// Include in ORDER BY for uniqueness
|
|
|
|
|
$this->addWhereRange( 'rc_id', $params['dir'], null, null );
|
|
|
|
|
|
|
|
|
|
if ( !is_null( $params['continue'] ) ) {
|
|
|
|
|
$cont = explode( '|', $params['continue'] );
|
|
|
|
|
$this->dieContinueUsageIf( count( $cont ) != 2 );
|
|
|
|
|
$op = ( $params['dir'] === 'newer' ? '>' : '<' );
|
|
|
|
|
$continueTimestamp = $db->addQuotes( $db->timestamp( $cont[0] ) );
|
|
|
|
|
$continueId = (int)$cont[1];
|
|
|
|
|
$this->dieContinueUsageIf( $continueId != $cont[1] );
|
|
|
|
|
$this->addWhere( "rc_timestamp $op $continueTimestamp OR " .
|
|
|
|
|
"(rc_timestamp = $continueTimestamp AND " .
|
|
|
|
|
"rc_id $op= $continueId)"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'wl_namespace', $params['namespace'] );
|
2011-08-08 16:20:17 +00:00
|
|
|
|
|
|
|
|
if ( !$params['allrev'] ) {
|
|
|
|
|
$this->addTables( 'page' );
|
2013-04-14 19:57:46 +00:00
|
|
|
$this->addJoinConds( array( 'page' => array( 'LEFT JOIN', 'rc_cur_id=page_id' ) ) );
|
2011-08-08 16:20:17 +00:00
|
|
|
$this->addWhere( 'rc_this_oldid=page_latest OR rc_type=' . RC_LOG );
|
|
|
|
|
}
|
2008-04-14 07:45:50 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( !is_null( $params['show'] ) ) {
|
|
|
|
|
$show = array_flip( $params['show'] );
|
2008-01-15 16:08:21 +00:00
|
|
|
|
|
|
|
|
/* Check for conflicting parameters. */
|
2013-04-26 12:18:06 +00:00
|
|
|
if ( ( isset( $show['minor'] ) && isset( $show['!minor'] ) )
|
2013-11-14 13:00:02 +00:00
|
|
|
|| ( isset( $show['bot'] ) && isset( $show['!bot'] ) )
|
|
|
|
|
|| ( isset( $show['anon'] ) && isset( $show['!anon'] ) )
|
|
|
|
|
|| ( isset( $show['patrolled'] ) && isset( $show['!patrolled'] ) )
|
2013-04-26 12:18:06 +00:00
|
|
|
) {
|
2011-05-19 17:51:16 +00:00
|
|
|
$this->dieUsageMsg( 'show' );
|
2008-01-15 16:08:21 +00:00
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
2010-07-23 07:17:56 +00:00
|
|
|
// Check permissions.
|
2010-07-14 19:00:54 +00:00
|
|
|
if ( isset( $show['patrolled'] ) || isset( $show['!patrolled'] ) ) {
|
2011-10-26 23:27:01 +00:00
|
|
|
if ( !$user->useRCPatrol() && !$user->useNPPatrol() ) {
|
2013-11-14 13:31:56 +00:00
|
|
|
$this->dieUsage(
|
|
|
|
|
'You need the patrol right to request the patrolled flag',
|
|
|
|
|
'permissiondenied'
|
|
|
|
|
);
|
2010-07-14 19:00:54 +00:00
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2008-01-15 16:08:21 +00:00
|
|
|
|
|
|
|
|
/* Add additional conditions to query depending upon parameters. */
|
2010-02-26 13:18:56 +00:00
|
|
|
$this->addWhereIf( 'rc_minor = 0', isset( $show['!minor'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_minor != 0', isset( $show['minor'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_bot = 0', isset( $show['!bot'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_bot != 0', isset( $show['bot'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_user = 0', isset( $show['anon'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_user != 0', isset( $show['!anon'] ) );
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereIf( 'rc_patrolled = 0', isset( $show['!patrolled'] ) );
|
|
|
|
|
$this->addWhereIf( 'rc_patrolled != 0', isset( $show['patrolled'] ) );
|
2008-01-15 16:08:21 +00:00
|
|
|
}
|
2009-07-24 01:22:06 +00:00
|
|
|
|
2013-04-30 16:01:00 +00:00
|
|
|
if ( !is_null( $params['type'] ) ) {
|
|
|
|
|
$this->addWhereFld( 'rc_type', $this->parseRCType( $params['type'] ) );
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( !is_null( $params['user'] ) && !is_null( $params['excludeuser'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->dieUsage( 'user and excludeuser cannot be used together', 'user-excludeuser' );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
if ( !is_null( $params['user'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'rc_user_text', $params['user'] );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
if ( !is_null( $params['excludeuser'] ) ) {
|
2011-05-01 00:17:39 +00:00
|
|
|
$this->addWhere( 'rc_user_text != ' . $db->addQuotes( $params['excludeuser'] ) );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2008-01-15 16:08:21 +00:00
|
|
|
|
2010-01-23 22:52:40 +00:00
|
|
|
// This is an index optimization for mysql, as done in the Special:Watchlist page
|
2013-11-14 13:31:56 +00:00
|
|
|
$this->addWhereIf(
|
|
|
|
|
"rc_timestamp > ''",
|
|
|
|
|
!isset( $params['start'] ) && !isset( $params['end'] ) && $db->getType() == 'mysql'
|
|
|
|
|
);
|
2006-10-21 08:26:32 +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
|
|
|
// Paranoia: avoid brute force searches (bug 17342)
|
|
|
|
|
if ( !is_null( $params['user'] ) || !is_null( $params['excludeuser'] ) ) {
|
|
|
|
|
if ( !$user->isAllowed( 'deletedhistory' ) ) {
|
|
|
|
|
$bitmask = Revision::DELETED_USER;
|
|
|
|
|
} elseif ( !$user->isAllowed( 'suppressrevision' ) ) {
|
|
|
|
|
$bitmask = Revision::DELETED_USER | Revision::DELETED_RESTRICTED;
|
|
|
|
|
} else {
|
|
|
|
|
$bitmask = 0;
|
|
|
|
|
}
|
|
|
|
|
if ( $bitmask ) {
|
|
|
|
|
$this->addWhere( $this->getDB()->bitAnd( 'rc_deleted', $bitmask ) . " != $bitmask" );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// LogPage::DELETED_ACTION hides the affected page, too. So hide those
|
|
|
|
|
// entirely from the watchlist, or someone could guess the title.
|
|
|
|
|
if ( !$user->isAllowed( 'deletedhistory' ) ) {
|
|
|
|
|
$bitmask = LogPage::DELETED_ACTION;
|
|
|
|
|
} elseif ( !$user->isAllowed( 'suppressrevision' ) ) {
|
|
|
|
|
$bitmask = LogPage::DELETED_ACTION | LogPage::DELETED_RESTRICTED;
|
|
|
|
|
} else {
|
|
|
|
|
$bitmask = 0;
|
|
|
|
|
}
|
|
|
|
|
if ( $bitmask ) {
|
|
|
|
|
$this->addWhere( $this->getDB()->makeList( array(
|
|
|
|
|
'rc_type != ' . RC_LOG,
|
|
|
|
|
$this->getDB()->bitAnd( 'rc_deleted', $bitmask ) . " != $bitmask",
|
|
|
|
|
), LIST_OR ) );
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addOption( 'LIMIT', $params['limit'] + 1 );
|
2006-10-13 06:13:13 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
$ids = array();
|
2006-10-13 06:13:13 +00:00
|
|
|
$count = 0;
|
2010-01-11 15:55:52 +00:00
|
|
|
$res = $this->select( __METHOD__ );
|
2006-10-20 07:10:18 +00:00
|
|
|
|
2010-06-20 18:48:34 +00:00
|
|
|
foreach ( $res as $row ) {
|
2013-11-14 13:00:02 +00:00
|
|
|
if ( ++$count > $params['limit'] ) {
|
2013-11-14 13:31:56 +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', "$row->rc_timestamp|$row->rc_id" );
|
2006-10-13 06:13:13 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( is_null( $resultPageSet ) ) {
|
|
|
|
|
$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', "$row->rc_timestamp|$row->rc_id" );
|
* 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-10-21 08:26:32 +00:00
|
|
|
} else {
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $params['allrev'] ) {
|
|
|
|
|
$ids[] = intval( $row->rc_this_oldid );
|
2007-07-14 19:04:31 +00:00
|
|
|
} else {
|
2010-01-11 15:55:52 +00:00
|
|
|
$ids[] = intval( $row->rc_cur_id );
|
2006-10-16 00:08:03 +00:00
|
|
|
}
|
2006-10-13 06:13:13 +00:00
|
|
|
}
|
|
|
|
|
}
|
2006-10-21 08:26:32 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( is_null( $resultPageSet ) ) {
|
2013-11-14 13:31:56 +00:00
|
|
|
$this->getResult()->setIndexedTagName_internal(
|
|
|
|
|
array( 'query', $this->getModuleName() ),
|
|
|
|
|
'item'
|
|
|
|
|
);
|
2010-02-26 13:18:56 +00:00
|
|
|
} elseif ( $params['allrev'] ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$resultPageSet->populateFromRevisionIDs( $ids );
|
2006-10-14 16:02:42 +00:00
|
|
|
} else {
|
2010-01-11 15:55:52 +00:00
|
|
|
$resultPageSet->populateFromPageIDs( $ids );
|
2006-10-16 00:08:03 +00:00
|
|
|
}
|
2006-10-13 06:13:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
private function extractRowInfo( $row ) {
|
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
|
|
|
/* Determine the title of the page that has been changed. */
|
|
|
|
|
$title = Title::makeTitle( $row->rc_namespace, $row->rc_title );
|
|
|
|
|
$user = $this->getUser();
|
|
|
|
|
|
|
|
|
|
/* Our output data. */
|
2010-02-26 13:18:56 +00:00
|
|
|
$vals = array();
|
2007-05-20 10:08:40 +00:00
|
|
|
|
2013-04-30 16:01:00 +00:00
|
|
|
$type = intval( $row->rc_type );
|
|
|
|
|
|
|
|
|
|
/* Determine what kind of change this was. */
|
|
|
|
|
switch ( $type ) {
|
|
|
|
|
case RC_EDIT:
|
|
|
|
|
$vals['type'] = 'edit';
|
|
|
|
|
break;
|
|
|
|
|
case RC_NEW:
|
|
|
|
|
$vals['type'] = 'new';
|
|
|
|
|
break;
|
|
|
|
|
case RC_MOVE:
|
|
|
|
|
$vals['type'] = 'move';
|
|
|
|
|
break;
|
|
|
|
|
case RC_LOG:
|
|
|
|
|
$vals['type'] = 'log';
|
|
|
|
|
break;
|
|
|
|
|
case RC_EXTERNAL:
|
|
|
|
|
$vals['type'] = 'external';
|
|
|
|
|
break;
|
|
|
|
|
case RC_MOVE_OVER_REDIRECT:
|
|
|
|
|
$vals['type'] = 'move over redirect';
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
$vals['type'] = $type;
|
|
|
|
|
}
|
|
|
|
|
|
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;
|
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
|
|
|
/* Create a new entry in the result for the title. */
|
|
|
|
|
if ( $this->fld_title || $this->fld_ids ) {
|
|
|
|
|
// These should already have been filtered out of the query, but just in case.
|
|
|
|
|
if ( $type === RC_LOG && ( $row->rc_deleted & LogPage::DELETED_ACTION ) ) {
|
|
|
|
|
$vals['actionhidden'] = '';
|
|
|
|
|
$anyHidden = true;
|
|
|
|
|
}
|
|
|
|
|
if ( $type !== RC_LOG ||
|
|
|
|
|
LogEventsList::userCanBitfield( $row->rc_deleted, LogPage::DELETED_ACTION, $user )
|
|
|
|
|
) {
|
|
|
|
|
if ( $this->fld_title ) {
|
|
|
|
|
ApiQueryBase::addTitleInfo( $vals, $title );
|
|
|
|
|
}
|
|
|
|
|
if ( $this->fld_ids ) {
|
|
|
|
|
$vals['pageid'] = intval( $row->rc_cur_id );
|
|
|
|
|
$vals['revid'] = intval( $row->rc_this_oldid );
|
|
|
|
|
$vals['old_revid'] = intval( $row->rc_last_oldid );
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 10:08:40 +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
|
|
|
/* Add user data and 'anon' flag, if user is anonymous. */
|
2010-08-28 01:09:21 +00:00
|
|
|
if ( $this->fld_user || $this->fld_userid ) {
|
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 ( $row->rc_deleted & Revision::DELETED_USER ) {
|
|
|
|
|
$vals['userhidden'] = '';
|
|
|
|
|
$anyHidden = true;
|
2010-08-28 01:09:21 +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 ( Revision::userCanBitfield( $row->rc_deleted, Revision::DELETED_USER, $user ) ) {
|
|
|
|
|
if ( $this->fld_userid ) {
|
|
|
|
|
$vals['userid'] = $row->rc_user;
|
|
|
|
|
// for backwards compatibility
|
|
|
|
|
$vals['user'] = $row->rc_user;
|
|
|
|
|
}
|
2010-08-28 01:09:21 +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 ( $this->fld_user ) {
|
|
|
|
|
$vals['user'] = $row->rc_user_text;
|
|
|
|
|
}
|
2013-02-16 18:30:57 +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 ( !$row->rc_user ) {
|
|
|
|
|
$vals['anon'] = '';
|
|
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 10:08:40 +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
|
|
|
/* Add flags, such as new, minor, bot. */
|
2010-01-11 15:55:52 +00:00
|
|
|
if ( $this->fld_flags ) {
|
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 ( $row->rc_bot ) {
|
|
|
|
|
$vals['bot'] = '';
|
|
|
|
|
}
|
2012-08-05 22:08:35 +00:00
|
|
|
if ( $row->rc_type == RC_NEW ) {
|
2007-05-20 10:08:40 +00:00
|
|
|
$vals['new'] = '';
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
|
|
|
|
if ( $row->rc_minor ) {
|
2007-05-20 10:08:40 +00:00
|
|
|
$vals['minor'] = '';
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 10:08:40 +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
|
|
|
/* Add sizes of each revision. (Only available on 1.10+) */
|
|
|
|
|
if ( $this->fld_sizes ) {
|
|
|
|
|
$vals['oldlen'] = intval( $row->rc_old_len );
|
|
|
|
|
$vals['newlen'] = intval( $row->rc_new_len );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 10:08:40 +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
|
|
|
/* Add the timestamp. */
|
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->rc_timestamp );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-05-20 10:08:40 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
if ( $this->fld_notificationtimestamp ) {
|
2010-07-06 13:15:59 +00:00
|
|
|
$vals['notificationtimestamp'] = ( $row->wl_notificationtimestamp == null )
|
|
|
|
|
? ''
|
2010-06-22 12:10:26 +00:00
|
|
|
: wfTimestamp( TS_ISO_8601, $row->wl_notificationtimestamp );
|
2010-02-26 13:18:56 +00:00
|
|
|
}
|
2007-07-08 12:31:28 +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
|
|
|
/* Add edit summary / log summary. */
|
|
|
|
|
if ( $this->fld_comment || $this->fld_parsedcomment ) {
|
|
|
|
|
if ( $row->rc_deleted & Revision::DELETED_COMMENT ) {
|
|
|
|
|
$vals['commenthidden'] = '';
|
|
|
|
|
$anyHidden = true;
|
|
|
|
|
}
|
|
|
|
|
if ( Revision::userCanBitfield( $row->rc_deleted, Revision::DELETED_COMMENT, $user ) ) {
|
|
|
|
|
if ( $this->fld_comment && isset( $row->rc_comment ) ) {
|
|
|
|
|
$vals['comment'] = $row->rc_comment;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) {
|
|
|
|
|
$vals['parsedcomment'] = Linker::formatComment( $row->rc_comment, $title );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add the patrolled flag */
|
|
|
|
|
if ( $this->fld_patrol && $row->rc_patrolled == 1 ) {
|
|
|
|
|
$vals['patrolled'] = '';
|
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 ( $this->fld_patrol && ChangesList::isUnpatrolled( $row, $user ) ) {
|
|
|
|
|
$vals['unpatrolled'] = '';
|
2010-01-31 23:06:35 +00:00
|
|
|
}
|
2007-05-20 10:08:40 +00:00
|
|
|
|
2011-05-20 21:47:38 +00:00
|
|
|
if ( $this->fld_loginfo && $row->rc_type == RC_LOG ) {
|
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 ( $row->rc_deleted & LogPage::DELETED_ACTION ) {
|
|
|
|
|
$vals['actionhidden'] = '';
|
|
|
|
|
$anyHidden = true;
|
|
|
|
|
}
|
|
|
|
|
if ( LogEventsList::userCanBitfield( $row->rc_deleted, LogPage::DELETED_ACTION, $user ) ) {
|
|
|
|
|
$vals['logid'] = intval( $row->rc_logid );
|
|
|
|
|
$vals['logtype'] = $row->rc_log_type;
|
|
|
|
|
$vals['logaction'] = $row->rc_log_action;
|
|
|
|
|
$logEntry = DatabaseLogEntry::newFromRow( (array)$row );
|
|
|
|
|
ApiQueryLogEvents::addLogParams(
|
|
|
|
|
$this->getResult(),
|
|
|
|
|
$vals,
|
|
|
|
|
$logEntry->getParameters(),
|
|
|
|
|
$logEntry->getType(),
|
|
|
|
|
$logEntry->getSubtype(),
|
|
|
|
|
$logEntry->getTimestamp()
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( $anyHidden && ( $row->rc_deleted & Revision::DELETED_RESTRICTED ) ) {
|
|
|
|
|
$vals['suppressed'] = '';
|
2011-05-20 21:47:38 +00:00
|
|
|
}
|
|
|
|
|
|
2007-05-20 10:08:40 +00:00
|
|
|
return $vals;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-27 16:58:05 +00:00
|
|
|
/** Copied from ApiQueryRecentChanges.
|
|
|
|
|
*
|
|
|
|
|
* @param string $type
|
|
|
|
|
* @return string
|
|
|
|
|
*/
|
2013-04-30 16:01:00 +00:00
|
|
|
private function parseRCType( $type ) {
|
|
|
|
|
if ( is_array( $type ) ) {
|
|
|
|
|
$retval = array();
|
|
|
|
|
foreach ( $type as $t ) {
|
|
|
|
|
$retval[] = $this->parseRCType( $t );
|
|
|
|
|
}
|
2013-11-14 13:00:02 +00:00
|
|
|
|
2013-04-30 16:01:00 +00:00
|
|
|
return $retval;
|
|
|
|
|
}
|
2013-12-30 17:37:51 +00:00
|
|
|
|
2013-04-30 16:01:00 +00:00
|
|
|
switch ( $type ) {
|
|
|
|
|
case 'edit':
|
|
|
|
|
return RC_EDIT;
|
|
|
|
|
case 'new':
|
|
|
|
|
return RC_NEW;
|
|
|
|
|
case 'log':
|
|
|
|
|
return RC_LOG;
|
|
|
|
|
case 'external':
|
|
|
|
|
return RC_EXTERNAL;
|
2013-12-30 17:37:51 +00:00
|
|
|
default:
|
|
|
|
|
ApiBase::dieDebug( __METHOD__, "Unknown type '$type'" );
|
2013-04-30 16:01:00 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-28 19:05:26 +00:00
|
|
|
public function getAllowedParams() {
|
2010-02-26 13:18:56 +00:00
|
|
|
return array(
|
2006-10-13 06:13:13 +00:00
|
|
|
'allrev' => false,
|
2010-02-26 13:18:56 +00:00
|
|
|
'start' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => 'timestamp'
|
2006-10-13 06:13:13 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'end' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => 'timestamp'
|
2006-10-13 06:13:13 +00:00
|
|
|
),
|
2013-04-14 19:57:46 +00:00
|
|
|
'namespace' => array(
|
2010-02-26 13:18:56 +00:00
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_TYPE => 'namespace'
|
2006-10-13 06:13:13 +00:00
|
|
|
),
|
2009-06-19 08:03:52 +00:00
|
|
|
'user' => array(
|
2010-02-26 13:18:56 +00:00
|
|
|
ApiBase::PARAM_TYPE => 'user',
|
2009-06-19 08:03:52 +00:00
|
|
|
),
|
|
|
|
|
'excludeuser' => array(
|
2010-02-26 13:18:56 +00:00
|
|
|
ApiBase::PARAM_TYPE => 'user',
|
2009-06-19 08:03:52 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'dir' => array(
|
|
|
|
|
ApiBase::PARAM_DFLT => 'older',
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
2006-10-13 06:13:13 +00:00
|
|
|
'newer',
|
|
|
|
|
'older'
|
|
|
|
|
)
|
|
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'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-10-16 05:53:07 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'prop' => array(
|
2010-07-27 18:33:04 +00:00
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_DFLT => 'ids|title|flags',
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
2007-05-21 04:34:48 +00:00
|
|
|
'ids',
|
|
|
|
|
'title',
|
2007-05-20 10:08:40 +00:00
|
|
|
'flags',
|
2006-10-16 05:53:07 +00:00
|
|
|
'user',
|
2010-08-28 01:09:21 +00:00
|
|
|
'userid',
|
2006-10-16 05:53:07 +00:00
|
|
|
'comment',
|
2010-01-31 23:06:35 +00:00
|
|
|
'parsedcomment',
|
2006-10-16 05:53:07 +00:00
|
|
|
'timestamp',
|
2007-07-08 12:31:28 +00:00
|
|
|
'patrol',
|
|
|
|
|
'sizes',
|
2011-05-20 21:47:38 +00:00
|
|
|
'notificationtimestamp',
|
|
|
|
|
'loginfo',
|
2006-10-16 05:53:07 +00:00
|
|
|
)
|
2008-01-15 16:08:21 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'show' => array(
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
2008-01-15 16:08:21 +00:00
|
|
|
'minor',
|
|
|
|
|
'!minor',
|
|
|
|
|
'bot',
|
|
|
|
|
'!bot',
|
|
|
|
|
'anon',
|
2008-10-28 14:20:29 +00:00
|
|
|
'!anon',
|
|
|
|
|
'patrolled',
|
|
|
|
|
'!patrolled',
|
2008-01-15 16:08:21 +00:00
|
|
|
)
|
2009-07-24 01:22:06 +00:00
|
|
|
),
|
2013-04-30 16:01:00 +00:00
|
|
|
'type' => array(
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
|
|
|
|
'edit',
|
|
|
|
|
'external',
|
|
|
|
|
'new',
|
|
|
|
|
'log',
|
|
|
|
|
)
|
|
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'owner' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => 'user'
|
2009-07-26 17:04:22 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'token' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => 'string'
|
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
|
|
|
),
|
2013-12-24 20:26:47 +00:00
|
|
|
'continue' => null,
|
2006-10-13 06:13:13 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-28 19:05:26 +00:00
|
|
|
public function getParamDescription() {
|
2011-03-12 23:39:15 +00:00
|
|
|
$p = $this->getModulePrefix();
|
2013-11-14 13:00:02 +00:00
|
|
|
|
2010-02-26 13:18:56 +00:00
|
|
|
return array(
|
2010-05-11 22:30:18 +00:00
|
|
|
'allrev' => 'Include multiple revisions of the same page within given timeframe',
|
|
|
|
|
'start' => 'The timestamp to start enumerating from',
|
|
|
|
|
'end' => 'The timestamp to end enumerating',
|
|
|
|
|
'namespace' => 'Filter changes to only the given namespace(s)',
|
2009-06-19 08:03:52 +00:00
|
|
|
'user' => 'Only list changes by this user',
|
|
|
|
|
'excludeuser' => 'Don\'t list changes by this user',
|
2011-03-12 23:39:15 +00:00
|
|
|
'dir' => $this->getDirectionDescription( $p ),
|
2010-05-11 22:30:18 +00:00
|
|
|
'limit' => 'How many total results to return per request',
|
2010-06-23 19:36:26 +00:00
|
|
|
'prop' => array(
|
|
|
|
|
'Which additional items to get (non-generator mode only).',
|
|
|
|
|
' ids - Adds revision ids and page ids',
|
|
|
|
|
' title - Adds title of the page',
|
|
|
|
|
' flags - Adds flags for the edit',
|
2010-08-28 01:09:21 +00:00
|
|
|
' user - Adds the user who made the edit',
|
|
|
|
|
' userid - Adds user id of whom made the edit',
|
2010-06-23 19:36:26 +00:00
|
|
|
' comment - Adds comment of the edit',
|
|
|
|
|
' parsedcomment - Adds parsed comment of the edit',
|
|
|
|
|
' timestamp - Adds timestamp of the edit',
|
|
|
|
|
' patrol - Tags edits that are patrolled',
|
2011-10-30 21:02:11 +00:00
|
|
|
' sizes - Adds the old and new lengths of the page',
|
2010-06-23 19:36:26 +00:00
|
|
|
' notificationtimestamp - Adds timestamp of when the user was last notified about the edit',
|
2011-05-20 21:47:38 +00:00
|
|
|
' loginfo - Adds log information where appropriate',
|
2010-06-23 19:36:26 +00:00
|
|
|
),
|
2010-02-26 13:18:56 +00:00
|
|
|
'show' => array(
|
2008-01-15 16:08:21 +00:00
|
|
|
'Show only items that meet this criteria.',
|
2011-03-12 23:39:15 +00:00
|
|
|
"For example, to see only minor edits done by logged-in users, set {$p}show=minor|!anon"
|
2009-07-24 01:22:06 +00:00
|
|
|
),
|
2013-04-30 16:01:00 +00:00
|
|
|
'type' => array(
|
|
|
|
|
'Which types of changes to show',
|
|
|
|
|
' edit - Regular page edits',
|
|
|
|
|
' external - External changes',
|
|
|
|
|
' new - Page creations',
|
|
|
|
|
' log - Log entries',
|
|
|
|
|
),
|
2010-05-11 22:30:18 +00:00
|
|
|
'owner' => 'The name of the user whose watchlist you\'d like to access',
|
2013-11-14 13:31:56 +00:00
|
|
|
'token' => 'Give a security token (settable in preferences) to ' .
|
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
|
|
|
'allow access to another user\'s watchlist',
|
2013-12-24 20:26:47 +00:00
|
|
|
'continue' => 'When more results are available, use this to continue',
|
2006-10-13 06:13:13 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
Added result properties to action=paraminfo
Added information about the properties of the results of API calls
to action=paraminfo, including information about "property groups":
what should the prop parameter be set to to get that property.
Uses the same format for types as parameters already do.
The output format of some modules doesn't fit this, so the result
properties for them weren't added, or only partially.
Partially implemented modules:
* expandtemplates:
parsetree is in its own tag
* protect, allusers, backlinks, deletedrevs, info, imageinfo,
logevents, querypage, recentchanges, revisions, searchinfo,
usercontribs, userinfo, users, watchlist, upload:
response with partially complex structure
Not implemented modules:
* feedcontributions, feedwatchlist, opensearch, rds:
non-standard reponse
* help:
error is normal response; not very useful for automated tools anyway
* paraminfo, parse, pageprops, siteinfo, userrights:
response with complex structure
Change-Id: Iff2a9bef79f994e73eef3062b4dd5461bff968ab
2012-05-02 15:00:30 +00:00
|
|
|
public function getResultProperties() {
|
|
|
|
|
global $wgLogTypes;
|
2013-11-14 13:00:02 +00:00
|
|
|
|
Added result properties to action=paraminfo
Added information about the properties of the results of API calls
to action=paraminfo, including information about "property groups":
what should the prop parameter be set to to get that property.
Uses the same format for types as parameters already do.
The output format of some modules doesn't fit this, so the result
properties for them weren't added, or only partially.
Partially implemented modules:
* expandtemplates:
parsetree is in its own tag
* protect, allusers, backlinks, deletedrevs, info, imageinfo,
logevents, querypage, recentchanges, revisions, searchinfo,
usercontribs, userinfo, users, watchlist, upload:
response with partially complex structure
Not implemented modules:
* feedcontributions, feedwatchlist, opensearch, rds:
non-standard reponse
* help:
error is normal response; not very useful for automated tools anyway
* paraminfo, parse, pageprops, siteinfo, userrights:
response with complex structure
Change-Id: Iff2a9bef79f994e73eef3062b4dd5461bff968ab
2012-05-02 15:00:30 +00:00
|
|
|
return array(
|
2013-04-30 16:01:00 +00:00
|
|
|
'' => array(
|
|
|
|
|
'type' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => array(
|
|
|
|
|
'edit',
|
|
|
|
|
'new',
|
|
|
|
|
'move',
|
|
|
|
|
'log',
|
|
|
|
|
'move over redirect'
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
),
|
Added result properties to action=paraminfo
Added information about the properties of the results of API calls
to action=paraminfo, including information about "property groups":
what should the prop parameter be set to to get that property.
Uses the same format for types as parameters already do.
The output format of some modules doesn't fit this, so the result
properties for them weren't added, or only partially.
Partially implemented modules:
* expandtemplates:
parsetree is in its own tag
* protect, allusers, backlinks, deletedrevs, info, imageinfo,
logevents, querypage, recentchanges, revisions, searchinfo,
usercontribs, userinfo, users, watchlist, upload:
response with partially complex structure
Not implemented modules:
* feedcontributions, feedwatchlist, opensearch, rds:
non-standard reponse
* help:
error is normal response; not very useful for automated tools anyway
* paraminfo, parse, pageprops, siteinfo, userrights:
response with complex structure
Change-Id: Iff2a9bef79f994e73eef3062b4dd5461bff968ab
2012-05-02 15:00:30 +00:00
|
|
|
'ids' => array(
|
|
|
|
|
'pageid' => 'integer',
|
|
|
|
|
'revid' => 'integer',
|
|
|
|
|
'old_revid' => 'integer'
|
|
|
|
|
),
|
|
|
|
|
'title' => array(
|
|
|
|
|
'ns' => 'namespace',
|
|
|
|
|
'title' => 'string'
|
|
|
|
|
),
|
|
|
|
|
'user' => array(
|
|
|
|
|
'user' => 'string',
|
|
|
|
|
'anon' => 'boolean'
|
|
|
|
|
),
|
|
|
|
|
'userid' => array(
|
|
|
|
|
'userid' => 'integer',
|
|
|
|
|
'anon' => 'boolean'
|
|
|
|
|
),
|
|
|
|
|
'flags' => array(
|
|
|
|
|
'new' => 'boolean',
|
|
|
|
|
'minor' => 'boolean',
|
|
|
|
|
'bot' => 'boolean'
|
|
|
|
|
),
|
|
|
|
|
'patrol' => array(
|
|
|
|
|
'patrolled' => 'boolean'
|
|
|
|
|
),
|
|
|
|
|
'timestamp' => array(
|
|
|
|
|
'timestamp' => 'timestamp'
|
|
|
|
|
),
|
|
|
|
|
'sizes' => array(
|
|
|
|
|
'oldlen' => 'integer',
|
|
|
|
|
'newlen' => 'integer'
|
|
|
|
|
),
|
|
|
|
|
'notificationtimestamp' => array(
|
|
|
|
|
'notificationtimestamp' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => 'timestamp',
|
|
|
|
|
ApiBase::PROP_NULLABLE => true
|
|
|
|
|
)
|
|
|
|
|
),
|
|
|
|
|
'comment' => array(
|
|
|
|
|
'comment' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => 'string',
|
|
|
|
|
ApiBase::PROP_NULLABLE => true
|
|
|
|
|
)
|
|
|
|
|
),
|
|
|
|
|
'parsedcomment' => array(
|
|
|
|
|
'parsedcomment' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => 'string',
|
|
|
|
|
ApiBase::PROP_NULLABLE => true
|
|
|
|
|
)
|
|
|
|
|
),
|
|
|
|
|
'loginfo' => array(
|
|
|
|
|
'logid' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => 'integer',
|
|
|
|
|
ApiBase::PROP_NULLABLE => true
|
|
|
|
|
),
|
|
|
|
|
'logtype' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => $wgLogTypes,
|
|
|
|
|
ApiBase::PROP_NULLABLE => true
|
|
|
|
|
),
|
|
|
|
|
'logaction' => array(
|
|
|
|
|
ApiBase::PROP_TYPE => 'string',
|
|
|
|
|
ApiBase::PROP_NULLABLE => true
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-28 19:05:26 +00:00
|
|
|
public function getDescription() {
|
2014-03-09 20:22:47 +00:00
|
|
|
return "Get all recent changes to pages in the logged in user's watchlist.";
|
2006-10-13 06:13:13 +00:00
|
|
|
}
|
2010-02-26 13:18:56 +00:00
|
|
|
|
2010-02-13 01:21:52 +00:00
|
|
|
public function getPossibleErrors() {
|
|
|
|
|
return array_merge( parent::getPossibleErrors(), array(
|
|
|
|
|
array( 'code' => 'bad_wlowner', 'info' => 'Specified user does not exist' ),
|
2013-11-14 13:31:56 +00:00
|
|
|
array(
|
|
|
|
|
'code' => 'bad_wltoken',
|
|
|
|
|
'info' => 'Incorrect watchlist token provided -- ' .
|
|
|
|
|
'please set a correct token in Special:Preferences'
|
|
|
|
|
),
|
2010-02-13 01:21:52 +00:00
|
|
|
array( 'code' => 'notloggedin', 'info' => 'You must be logged-in to have a watchlist' ),
|
|
|
|
|
array( 'code' => 'patrol', 'info' => 'patrol property is not available' ),
|
2010-02-14 15:16:09 +00:00
|
|
|
array( 'show' ),
|
2013-11-14 13:31:56 +00:00
|
|
|
array(
|
|
|
|
|
'code' => 'permissiondenied',
|
|
|
|
|
'info' => 'You need the patrol right to request the patrolled flag'
|
|
|
|
|
),
|
2010-02-13 01:21:52 +00:00
|
|
|
array( 'code' => 'user-excludeuser', 'info' => 'user and excludeuser cannot be used together' ),
|
|
|
|
|
) );
|
|
|
|
|
}
|
2006-10-13 06:13:13 +00:00
|
|
|
|
2011-08-17 22:24:21 +00:00
|
|
|
public function getExamples() {
|
2010-02-26 13:18:56 +00:00
|
|
|
return array(
|
2007-05-21 04:34:48 +00:00
|
|
|
'api.php?action=query&list=watchlist',
|
|
|
|
|
'api.php?action=query&list=watchlist&wlprop=ids|title|timestamp|user|comment',
|
2010-11-23 22:05:27 +00:00
|
|
|
'api.php?action=query&list=watchlist&wlallrev=&wlprop=ids|title|timestamp|user|comment',
|
2006-10-14 16:02:42 +00:00
|
|
|
'api.php?action=query&generator=watchlist&prop=info',
|
2010-11-23 22:05:27 +00:00
|
|
|
'api.php?action=query&generator=watchlist&gwlallrev=&prop=revisions&rvprop=timestamp|user',
|
2013-03-11 03:45:51 +00:00
|
|
|
'api.php?action=query&list=watchlist&wlowner=Bob_Smith&wltoken=123ABC'
|
2006-10-13 06:13:13 +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:Watchlist';
|
2011-07-17 17:02:06 +00:00
|
|
|
}
|
2009-06-19 08:03:52 +00:00
|
|
|
}
|