2007-12-06 16:06:22 +00:00
|
|
|
<?php
|
2010-02-24 14:00:23 +00:00
|
|
|
/**
|
2010-12-22 20:52:06 +00:00
|
|
|
*
|
2007-12-06 16:06:22 +00:00
|
|
|
*
|
2010-08-07 19:59:42 +00:00
|
|
|
* Created on Sep 10, 2007
|
|
|
|
|
*
|
2012-07-15 20:13:02 +00:00
|
|
|
* Copyright © 2007 Roan Kattouw "<Firstname>.<Lastname>@gmail.com"
|
2007-12-06 16:06:22 +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.
|
2007-12-06 16:06:22 +00:00
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
2010-08-07 19:59:42 +00:00
|
|
|
*
|
|
|
|
|
* @file
|
2007-12-06 16:06:22 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/**
|
2011-06-05 21:04:48 +00:00
|
|
|
* Query module to enumerate all user blocks
|
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-12-06 16:06:22 +00:00
|
|
|
*/
|
|
|
|
|
class ApiQueryBlocks extends ApiQueryBase {
|
2010-02-24 14:00:23 +00:00
|
|
|
|
2014-03-25 17:22:11 +00:00
|
|
|
public function __construct( ApiQuery $query, $moduleName ) {
|
2010-02-24 14:00:23 +00:00
|
|
|
parent::__construct( $query, $moduleName, 'bk' );
|
2007-12-06 16:06:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function execute() {
|
2011-10-26 23:27:01 +00:00
|
|
|
global $wgContLang;
|
2007-12-06 16:06:22 +00:00
|
|
|
|
2013-12-24 20:26:47 +00:00
|
|
|
$db = $this->getDB();
|
2007-12-06 16:06:22 +00:00
|
|
|
$params = $this->extractRequestParams();
|
2011-06-06 16:45:40 +00:00
|
|
|
$this->requireMaxOneParameter( $params, 'users', 'ip' );
|
2008-06-19 13:43:14 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$prop = array_flip( $params['prop'] );
|
|
|
|
|
$fld_id = isset( $prop['id'] );
|
|
|
|
|
$fld_user = isset( $prop['user'] );
|
2011-02-21 19:48:15 +00:00
|
|
|
$fld_userid = isset( $prop['userid'] );
|
2010-01-11 15:55:52 +00:00
|
|
|
$fld_by = isset( $prop['by'] );
|
2011-02-21 19:48:15 +00:00
|
|
|
$fld_byid = isset( $prop['byid'] );
|
2010-01-11 15:55:52 +00:00
|
|
|
$fld_timestamp = isset( $prop['timestamp'] );
|
|
|
|
|
$fld_expiry = isset( $prop['expiry'] );
|
|
|
|
|
$fld_reason = isset( $prop['reason'] );
|
|
|
|
|
$fld_range = isset( $prop['range'] );
|
|
|
|
|
$fld_flags = isset( $prop['flags'] );
|
2007-12-06 16:06:22 +00:00
|
|
|
|
|
|
|
|
$result = $this->getResult();
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addTables( 'ipblocks' );
|
2015-02-18 21:54:25 +00:00
|
|
|
$this->addFields( array( 'ipb_auto', 'ipb_id', 'ipb_timestamp' ) );
|
2010-02-15 12:20:52 +00:00
|
|
|
|
2011-06-01 16:40:59 +00:00
|
|
|
$this->addFieldsIf( array( 'ipb_address', 'ipb_user' ), $fld_user || $fld_userid );
|
|
|
|
|
$this->addFieldsIf( 'ipb_by_text', $fld_by );
|
|
|
|
|
$this->addFieldsIf( 'ipb_by', $fld_byid );
|
|
|
|
|
$this->addFieldsIf( 'ipb_expiry', $fld_expiry );
|
|
|
|
|
$this->addFieldsIf( 'ipb_reason', $fld_reason );
|
|
|
|
|
$this->addFieldsIf( array( 'ipb_range_start', 'ipb_range_end' ), $fld_range );
|
|
|
|
|
$this->addFieldsIf( array( 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock',
|
2013-11-14 12:51:06 +00:00
|
|
|
'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ),
|
|
|
|
|
$fld_flags );
|
2007-12-06 16:06:22 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addOption( 'LIMIT', $params['limit'] + 1 );
|
2013-11-14 17:38:36 +00:00
|
|
|
$this->addTimestampWhereRange(
|
|
|
|
|
'ipb_timestamp',
|
|
|
|
|
$params['dir'],
|
|
|
|
|
$params['start'],
|
|
|
|
|
$params['end']
|
|
|
|
|
);
|
2013-12-24 20:26:47 +00:00
|
|
|
// Include in ORDER BY for uniqueness
|
|
|
|
|
$this->addWhereRange( 'ipb_id', $params['dir'], null, null );
|
2012-02-18 01:07:42 +00:00
|
|
|
|
2013-12-24 20:26:47 +00:00
|
|
|
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( "ipb_timestamp $op $continueTimestamp OR " .
|
|
|
|
|
"(ipb_timestamp = $continueTimestamp AND " .
|
|
|
|
|
"ipb_id $op= $continueId)"
|
|
|
|
|
);
|
|
|
|
|
}
|
2012-02-18 01:07:42 +00:00
|
|
|
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( isset( $params['ids'] ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'ipb_id', $params['ids'] );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
|
|
|
|
if ( isset( $params['users'] ) ) {
|
2014-10-25 01:51:28 +00:00
|
|
|
$usernames = array();
|
2010-02-24 14:00:23 +00:00
|
|
|
foreach ( (array)$params['users'] as $u ) {
|
2014-10-25 01:51:28 +00:00
|
|
|
$usernames[] = $this->prepareUsername( $u );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2014-10-25 01:51:28 +00:00
|
|
|
$this->addWhereFld( 'ipb_address', $usernames );
|
2010-02-15 12:13:01 +00:00
|
|
|
$this->addWhereFld( 'ipb_auto', 0 );
|
2008-04-26 14:09:16 +00:00
|
|
|
}
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( isset( $params['ip'] ) ) {
|
2014-01-24 02:51:11 +00:00
|
|
|
$blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' );
|
2013-05-06 14:27:46 +00:00
|
|
|
if ( IP::isIPv4( $params['ip'] ) ) {
|
|
|
|
|
$type = 'IPv4';
|
2014-01-24 02:51:11 +00:00
|
|
|
$cidrLimit = $blockCIDRLimit['IPv4'];
|
2013-05-06 14:27:46 +00:00
|
|
|
$prefixLen = 0;
|
|
|
|
|
} elseif ( IP::isIPv6( $params['ip'] ) ) {
|
|
|
|
|
$type = 'IPv6';
|
2014-01-24 02:51:11 +00:00
|
|
|
$cidrLimit = $blockCIDRLimit['IPv6'];
|
2013-05-06 14:27:46 +00:00
|
|
|
$prefixLen = 3; // IP::toHex output is prefixed with "v6-"
|
2010-02-24 14:00:23 +00:00
|
|
|
} else {
|
2013-05-06 14:27:46 +00:00
|
|
|
$this->dieUsage( 'IP parameter is not valid', 'param_ip' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Check range validity, if it's a CIDR
|
|
|
|
|
list( $ip, $range ) = IP::parseCIDR( $params['ip'] );
|
|
|
|
|
if ( $ip !== false && $range !== false && $range < $cidrLimit ) {
|
2013-11-14 17:38:36 +00:00
|
|
|
$this->dieUsage(
|
|
|
|
|
"$type CIDR ranges broader than /$cidrLimit are not accepted",
|
|
|
|
|
'cidrtoobroad'
|
|
|
|
|
);
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2013-05-06 14:27:46 +00:00
|
|
|
|
|
|
|
|
# Let IP::parseRange handle calculating $upper, instead of duplicating the logic here.
|
|
|
|
|
list( $lower, $upper ) = IP::parseRange( $params['ip'] );
|
|
|
|
|
|
|
|
|
|
# Extract the common prefix to any rangeblock affecting this IP/CIDR
|
|
|
|
|
$prefix = substr( $lower, 0, $prefixLen + floor( $cidrLimit / 4 ) );
|
2010-02-24 14:00:23 +00:00
|
|
|
|
2012-05-16 17:22:36 +00:00
|
|
|
# Fairly hard to make a malicious SQL statement out of hex characters,
|
|
|
|
|
# but it is good practice to add quotes
|
|
|
|
|
$lower = $db->addQuotes( $lower );
|
|
|
|
|
$upper = $db->addQuotes( $upper );
|
|
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhere( array(
|
|
|
|
|
'ipb_range_start' . $db->buildLike( $prefix, $db->anyString() ),
|
2012-05-16 17:22:36 +00:00
|
|
|
'ipb_range_start <= ' . $lower,
|
|
|
|
|
'ipb_range_end >= ' . $upper,
|
2010-02-15 12:13:01 +00:00
|
|
|
'ipb_auto' => 0
|
2010-01-11 15:55:52 +00:00
|
|
|
) );
|
2008-06-19 13:43:14 +00:00
|
|
|
}
|
2010-07-23 07:33:40 +00:00
|
|
|
|
2011-08-13 15:39:57 +00:00
|
|
|
if ( !is_null( $params['show'] ) ) {
|
|
|
|
|
$show = array_flip( $params['show'] );
|
|
|
|
|
|
|
|
|
|
/* Check for conflicting parameters. */
|
2013-04-26 12:18:06 +00:00
|
|
|
if ( ( isset( $show['account'] ) && isset( $show['!account'] ) )
|
2013-11-14 12:51:06 +00:00
|
|
|
|| ( isset( $show['ip'] ) && isset( $show['!ip'] ) )
|
|
|
|
|
|| ( isset( $show['range'] ) && isset( $show['!range'] ) )
|
|
|
|
|
|| ( isset( $show['temp'] ) && isset( $show['!temp'] ) )
|
2011-08-13 15:39:57 +00:00
|
|
|
) {
|
|
|
|
|
$this->dieUsageMsg( 'show' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$this->addWhereIf( 'ipb_user = 0', isset( $show['!account'] ) );
|
|
|
|
|
$this->addWhereIf( 'ipb_user != 0', isset( $show['account'] ) );
|
|
|
|
|
$this->addWhereIf( 'ipb_user != 0 OR ipb_range_end > ipb_range_start', isset( $show['!ip'] ) );
|
|
|
|
|
$this->addWhereIf( 'ipb_user = 0 AND ipb_range_end = ipb_range_start', isset( $show['ip'] ) );
|
2013-11-14 17:38:36 +00:00
|
|
|
$this->addWhereIf( 'ipb_expiry = ' .
|
|
|
|
|
$db->addQuotes( $db->getInfinity() ), isset( $show['!temp'] ) );
|
|
|
|
|
$this->addWhereIf( 'ipb_expiry != ' .
|
|
|
|
|
$db->addQuotes( $db->getInfinity() ), isset( $show['temp'] ) );
|
2013-02-03 18:47:42 +00:00
|
|
|
$this->addWhereIf( 'ipb_range_end = ipb_range_start', isset( $show['!range'] ) );
|
|
|
|
|
$this->addWhereIf( 'ipb_range_end > ipb_range_start', isset( $show['range'] ) );
|
2011-08-13 15:39:57 +00:00
|
|
|
}
|
|
|
|
|
|
2011-10-26 23:27:01 +00:00
|
|
|
if ( !$this->getUser()->isAllowed( 'hideuser' ) ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->addWhereFld( 'ipb_deleted', 0 );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2007-12-06 16:06:22 +00:00
|
|
|
|
|
|
|
|
// Purge expired entries on one in every 10 queries
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( !mt_rand( 0, 10 ) ) {
|
2007-12-06 16:06:22 +00:00
|
|
|
Block::purgeExpired();
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2007-12-06 16:06:22 +00:00
|
|
|
|
2010-01-11 15:55:52 +00:00
|
|
|
$res = $this->select( __METHOD__ );
|
2007-12-06 16:06:22 +00:00
|
|
|
|
|
|
|
|
$count = 0;
|
2010-09-28 01:21:15 +00:00
|
|
|
foreach ( $res as $row ) {
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( ++$count > $params['limit'] ) {
|
2007-12-06 16:06:22 +00:00
|
|
|
// We've had enough
|
2013-12-24 20:26:47 +00:00
|
|
|
$this->setContinueEnumParameter( 'continue', "$row->ipb_timestamp|$row->ipb_id" );
|
2007-12-06 16:06:22 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2015-01-16 19:00:07 +00:00
|
|
|
$block = array(
|
|
|
|
|
ApiResult::META_TYPE => 'assoc',
|
|
|
|
|
);
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( $fld_id ) {
|
2015-05-06 15:33:08 +00:00
|
|
|
$block['id'] = (int)$row->ipb_id;
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
|
|
|
|
if ( $fld_user && !$row->ipb_auto ) {
|
2007-12-06 16:06:22 +00:00
|
|
|
$block['user'] = $row->ipb_address;
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2011-02-21 19:48:15 +00:00
|
|
|
if ( $fld_userid && !$row->ipb_auto ) {
|
2015-05-06 15:33:08 +00:00
|
|
|
$block['userid'] = (int)$row->ipb_user;
|
2011-02-21 19:48:15 +00:00
|
|
|
}
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( $fld_by ) {
|
2011-02-21 19:34:57 +00:00
|
|
|
$block['by'] = $row->ipb_by_text;
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2011-02-21 19:48:15 +00:00
|
|
|
if ( $fld_byid ) {
|
2015-05-06 15:33:08 +00:00
|
|
|
$block['byid'] = (int)$row->ipb_by;
|
2011-02-21 19:48:15 +00:00
|
|
|
}
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( $fld_timestamp ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$block['timestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
|
|
|
|
if ( $fld_expiry ) {
|
2011-03-18 19:15:56 +00:00
|
|
|
$block['expiry'] = $wgContLang->formatExpiry( $row->ipb_expiry, TS_ISO_8601 );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
|
|
|
|
if ( $fld_reason ) {
|
2007-12-06 16:06:22 +00:00
|
|
|
$block['reason'] = $row->ipb_reason;
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
|
|
|
|
if ( $fld_range && !$row->ipb_auto ) {
|
2012-11-11 02:25:17 +00:00
|
|
|
$block['rangestart'] = IP::formatHex( $row->ipb_range_start );
|
|
|
|
|
$block['rangeend'] = IP::formatHex( $row->ipb_range_end );
|
2007-12-06 16:06:22 +00:00
|
|
|
}
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( $fld_flags ) {
|
2007-12-06 16:06:22 +00:00
|
|
|
// For clarity, these flags use the same names as their action=block counterparts
|
2015-01-16 19:00:07 +00:00
|
|
|
$block['automatic'] = (bool)$row->ipb_auto;
|
|
|
|
|
$block['anononly'] = (bool)$row->ipb_anon_only;
|
|
|
|
|
$block['nocreate'] = (bool)$row->ipb_create_account;
|
|
|
|
|
$block['autoblock'] = (bool)$row->ipb_enable_autoblock;
|
|
|
|
|
$block['noemail'] = (bool)$row->ipb_block_email;
|
|
|
|
|
$block['hidden'] = (bool)$row->ipb_deleted;
|
|
|
|
|
$block['allowusertalk'] = (bool)$row->ipb_allow_usertalk;
|
2007-12-06 16:06:22 +00:00
|
|
|
}
|
2010-01-11 15:55:52 +00:00
|
|
|
$fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $block );
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( !$fit ) {
|
2013-12-24 20:26:47 +00:00
|
|
|
$this->setContinueEnumParameter( 'continue', "$row->ipb_timestamp|$row->ipb_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;
|
|
|
|
|
}
|
2007-12-06 16:06:22 +00:00
|
|
|
}
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
$result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'block' );
|
2007-12-06 16:06:22 +00:00
|
|
|
}
|
2010-02-24 14:00:23 +00:00
|
|
|
|
|
|
|
|
protected function prepareUsername( $user ) {
|
|
|
|
|
if ( !$user ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->dieUsage( 'User parameter may not be empty', 'param_user' );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2010-01-11 15:55:52 +00:00
|
|
|
$name = User::isIP( $user )
|
2008-06-19 13:43:14 +00:00
|
|
|
? $user
|
2010-01-11 15:55:52 +00:00
|
|
|
: User::getCanonicalName( $user, 'valid' );
|
2010-02-24 14:00:23 +00:00
|
|
|
if ( $name === false ) {
|
2010-01-11 15:55:52 +00:00
|
|
|
$this->dieUsage( "User name {$user} is not valid", 'param_user' );
|
2010-02-24 14:00:23 +00:00
|
|
|
}
|
2014-10-25 01:51:28 +00:00
|
|
|
return $name;
|
2008-04-26 14:09:16 +00:00
|
|
|
}
|
2007-12-06 16:06:22 +00:00
|
|
|
|
2008-01-28 19:05:26 +00:00
|
|
|
public function getAllowedParams() {
|
2014-09-18 17:38:23 +00:00
|
|
|
$blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' );
|
|
|
|
|
|
2010-02-24 14:00:23 +00:00
|
|
|
return array(
|
2007-12-06 16:06:22 +00:00
|
|
|
'start' => array(
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_TYPE => 'timestamp'
|
2007-12-06 16:06:22 +00:00
|
|
|
),
|
|
|
|
|
'end' => array(
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_TYPE => 'timestamp',
|
2007-12-06 16:06:22 +00:00
|
|
|
),
|
|
|
|
|
'dir' => array(
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_TYPE => array(
|
2007-12-06 16:06:22 +00:00
|
|
|
'newer',
|
|
|
|
|
'older'
|
|
|
|
|
),
|
2014-09-18 17:38:23 +00:00
|
|
|
ApiBase::PARAM_DFLT => 'older',
|
|
|
|
|
ApiBase::PARAM_HELP_MSG => 'api-help-param-direction',
|
2007-12-06 16:06:22 +00:00
|
|
|
),
|
|
|
|
|
'ids' => array(
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_TYPE => 'integer',
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true
|
2007-12-06 16:06:22 +00:00
|
|
|
),
|
|
|
|
|
'users' => array(
|
2016-01-04 18:55:26 +00:00
|
|
|
ApiBase::PARAM_TYPE => 'user',
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_ISMULTI => true
|
2007-12-06 16:06:22 +00:00
|
|
|
),
|
2014-09-18 17:38:23 +00:00
|
|
|
'ip' => array(
|
|
|
|
|
ApiBase::PARAM_HELP_MSG => array(
|
|
|
|
|
'apihelp-query+blocks-param-ip',
|
|
|
|
|
$blockCIDRLimit['IPv4'],
|
|
|
|
|
$blockCIDRLimit['IPv6'],
|
|
|
|
|
),
|
|
|
|
|
),
|
2007-12-06 16:06:22 +00:00
|
|
|
'limit' => array(
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_DFLT => 10,
|
|
|
|
|
ApiBase::PARAM_TYPE => 'limit',
|
|
|
|
|
ApiBase::PARAM_MIN => 1,
|
|
|
|
|
ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
|
|
|
|
|
ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
|
2007-12-06 16:06:22 +00:00
|
|
|
),
|
|
|
|
|
'prop' => array(
|
2010-02-24 14:00:23 +00:00
|
|
|
ApiBase::PARAM_DFLT => 'id|user|by|timestamp|expiry|reason|flags',
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
|
|
|
|
'id',
|
|
|
|
|
'user',
|
2011-02-21 19:48:15 +00:00
|
|
|
'userid',
|
2010-02-24 14:00:23 +00:00
|
|
|
'by',
|
2011-02-21 19:48:15 +00:00
|
|
|
'byid',
|
2010-02-24 14:00:23 +00:00
|
|
|
'timestamp',
|
|
|
|
|
'expiry',
|
|
|
|
|
'reason',
|
|
|
|
|
'range',
|
|
|
|
|
'flags'
|
|
|
|
|
),
|
2015-08-05 19:54:08 +00:00
|
|
|
ApiBase::PARAM_ISMULTI => true,
|
|
|
|
|
ApiBase::PARAM_HELP_MSG_PER_VALUE => array(),
|
2011-08-13 15:39:57 +00:00
|
|
|
),
|
|
|
|
|
'show' => array(
|
|
|
|
|
ApiBase::PARAM_TYPE => array(
|
|
|
|
|
'account',
|
|
|
|
|
'!account',
|
|
|
|
|
'temp',
|
|
|
|
|
'!temp',
|
|
|
|
|
'ip',
|
|
|
|
|
'!ip',
|
|
|
|
|
'range',
|
|
|
|
|
'!range',
|
|
|
|
|
),
|
|
|
|
|
ApiBase::PARAM_ISMULTI => true
|
|
|
|
|
),
|
2014-09-18 17:38:23 +00:00
|
|
|
'continue' => array(
|
|
|
|
|
ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
|
2010-06-23 19:36:26 +00:00
|
|
|
),
|
2007-12-06 16:06:22 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-28 17:17:02 +00:00
|
|
|
protected function getExamplesMessages() {
|
2010-02-24 14:00:23 +00:00
|
|
|
return array(
|
2014-09-18 17:38:23 +00:00
|
|
|
'action=query&list=blocks'
|
|
|
|
|
=> 'apihelp-query+blocks-example-simple',
|
|
|
|
|
'action=query&list=blocks&bkusers=Alice|Bob'
|
|
|
|
|
=> 'apihelp-query+blocks-example-users',
|
2007-12-06 16:06:22 +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:Blocks';
|
2011-07-17 17:02:06 +00:00
|
|
|
}
|
2010-07-23 07:17:56 +00:00
|
|
|
}
|