From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/api/ApiQueryBlocks.php | 147 ++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 98 deletions(-) (limited to 'includes/api/ApiQueryBlocks.php') diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index e3c27f5e..33b25fd9 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -32,17 +32,18 @@ class ApiQueryBlocks extends ApiQueryBase { /** - * @var Array + * @var array */ protected $usernames; - public function __construct( $query, $moduleName ) { + public function __construct( ApiQuery $query, $moduleName ) { parent::__construct( $query, $moduleName, 'bk' ); } public function execute() { global $wgContLang; + $db = $this->getDB(); $params = $this->extractRequestParams(); $this->requireMaxOneParameter( $params, 'users', 'ip' ); @@ -61,9 +62,8 @@ class ApiQueryBlocks extends ApiQueryBase { $result = $this->getResult(); $this->addTables( 'ipblocks' ); - $this->addFields( 'ipb_auto' ); + $this->addFields( array( 'ipb_auto', 'ipb_id' ) ); - $this->addFieldsIf( 'ipb_id', $fld_id ); $this->addFieldsIf( array( 'ipb_address', 'ipb_user' ), $fld_user || $fld_userid ); $this->addFieldsIf( 'ipb_by_text', $fld_by ); $this->addFieldsIf( 'ipb_by', $fld_byid ); @@ -72,13 +72,31 @@ class ApiQueryBlocks extends ApiQueryBase { $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', - 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ), - $fld_flags ); + 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ), + $fld_flags ); $this->addOption( 'LIMIT', $params['limit'] + 1 ); - $this->addTimestampWhereRange( 'ipb_timestamp', $params['dir'], $params['start'], $params['end'] ); - - $db = $this->getDB(); + $this->addTimestampWhereRange( + 'ipb_timestamp', + $params['dir'], + $params['start'], + $params['end'] + ); + // Include in ORDER BY for uniqueness + $this->addWhereRange( 'ipb_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( "ipb_timestamp $op $continueTimestamp OR " . + "(ipb_timestamp = $continueTimestamp AND " . + "ipb_id $op= $continueId)" + ); + } if ( isset( $params['ids'] ) ) { $this->addWhereFld( 'ipb_id', $params['ids'] ); @@ -91,14 +109,14 @@ class ApiQueryBlocks extends ApiQueryBase { $this->addWhereFld( 'ipb_auto', 0 ); } if ( isset( $params['ip'] ) ) { - global $wgBlockCIDRLimit; + $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' ); if ( IP::isIPv4( $params['ip'] ) ) { $type = 'IPv4'; - $cidrLimit = $wgBlockCIDRLimit['IPv4']; + $cidrLimit = $blockCIDRLimit['IPv4']; $prefixLen = 0; } elseif ( IP::isIPv6( $params['ip'] ) ) { $type = 'IPv6'; - $cidrLimit = $wgBlockCIDRLimit['IPv6']; + $cidrLimit = $blockCIDRLimit['IPv6']; $prefixLen = 3; // IP::toHex output is prefixed with "v6-" } else { $this->dieUsage( 'IP parameter is not valid', 'param_ip' ); @@ -107,7 +125,10 @@ class ApiQueryBlocks extends ApiQueryBase { # Check range validity, if it's a CIDR list( $ip, $range ) = IP::parseCIDR( $params['ip'] ); if ( $ip !== false && $range !== false && $range < $cidrLimit ) { - $this->dieUsage( "$type CIDR ranges broader than /$cidrLimit are not accepted", 'cidrtoobroad' ); + $this->dieUsage( + "$type CIDR ranges broader than /$cidrLimit are not accepted", + 'cidrtoobroad' + ); } # Let IP::parseRange handle calculating $upper, instead of duplicating the logic here. @@ -134,9 +155,9 @@ class ApiQueryBlocks extends ApiQueryBase { /* Check for conflicting parameters. */ if ( ( isset( $show['account'] ) && isset( $show['!account'] ) ) - || ( isset( $show['ip'] ) && isset( $show['!ip'] ) ) - || ( isset( $show['range'] ) && isset( $show['!range'] ) ) - || ( isset( $show['temp'] ) && isset( $show['!temp'] ) ) + || ( isset( $show['ip'] ) && isset( $show['!ip'] ) ) + || ( isset( $show['range'] ) && isset( $show['!range'] ) ) + || ( isset( $show['temp'] ) && isset( $show['!temp'] ) ) ) { $this->dieUsageMsg( 'show' ); } @@ -145,8 +166,10 @@ class ApiQueryBlocks extends ApiQueryBase { $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'] ) ); - $this->addWhereIf( 'ipb_expiry = ' . $db->addQuotes( $db->getInfinity() ), isset( $show['!temp'] ) ); - $this->addWhereIf( 'ipb_expiry != ' . $db->addQuotes( $db->getInfinity() ), isset( $show['temp'] ) ); + $this->addWhereIf( 'ipb_expiry = ' . + $db->addQuotes( $db->getInfinity() ), isset( $show['!temp'] ) ); + $this->addWhereIf( 'ipb_expiry != ' . + $db->addQuotes( $db->getInfinity() ), isset( $show['temp'] ) ); $this->addWhereIf( 'ipb_range_end = ipb_range_start', isset( $show['!range'] ) ); $this->addWhereIf( 'ipb_range_end > ipb_range_start', isset( $show['range'] ) ); } @@ -166,7 +189,7 @@ class ApiQueryBlocks extends ApiQueryBase { foreach ( $res as $row ) { if ( ++$count > $params['limit'] ) { // We've had enough - $this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->ipb_timestamp ) ); + $this->setContinueEnumParameter( 'continue', "$row->ipb_timestamp|$row->ipb_id" ); break; } $block = array(); @@ -224,7 +247,7 @@ class ApiQueryBlocks extends ApiQueryBase { } $fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $block ); if ( !$fit ) { - $this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->ipb_timestamp ) ); + $this->setContinueEnumParameter( 'continue', "$row->ipb_timestamp|$row->ipb_id" ); break; } } @@ -303,12 +326,14 @@ class ApiQueryBlocks extends ApiQueryBase { ), ApiBase::PARAM_ISMULTI => true ), + 'continue' => null, ); } public function getParamDescription() { - global $wgBlockCIDRLimit; + $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' ); $p = $this->getModulePrefix(); + return array( 'start' => 'The timestamp to start enumerating from', 'end' => 'The timestamp to stop enumerating at', @@ -318,7 +343,7 @@ class ApiQueryBlocks extends ApiQueryBase { 'ip' => array( 'Get all blocks applying to this IP or CIDR range, including range blocks.', "Cannot be used together with bkusers. CIDR ranges broader than " . - "IPv4/{$wgBlockCIDRLimit['IPv4']} or IPv6/{$wgBlockCIDRLimit['IPv6']} " . + "IPv4/{$blockCIDRLimit['IPv4']} or IPv6/{$blockCIDRLimit['IPv6']} " . "are not accepted" ), 'limit' => 'The maximum amount of blocks to list', @@ -339,86 +364,12 @@ class ApiQueryBlocks extends ApiQueryBase { 'Show only items that meet this criteria.', "For example, to see only indefinite blocks on IPs, set {$p}show=ip|!temp" ), - ); - } - - public function getResultProperties() { - return array( - 'id' => array( - 'id' => 'integer' - ), - 'user' => array( - 'user' => array( - ApiBase::PROP_TYPE => 'string', - ApiBase::PROP_NULLABLE => true - ) - ), - 'userid' => array( - 'userid' => array( - ApiBase::PROP_TYPE => 'integer', - ApiBase::PROP_NULLABLE => true - ) - ), - 'by' => array( - 'by' => 'string' - ), - 'byid' => array( - 'byid' => 'integer' - ), - 'timestamp' => array( - 'timestamp' => 'timestamp' - ), - 'expiry' => array( - 'expiry' => 'timestamp' - ), - 'reason' => array( - 'reason' => 'string' - ), - 'range' => array( - 'rangestart' => array( - ApiBase::PROP_TYPE => 'string', - ApiBase::PROP_NULLABLE => true - ), - 'rangeend' => array( - ApiBase::PROP_TYPE => 'string', - ApiBase::PROP_NULLABLE => true - ) - ), - 'flags' => array( - 'automatic' => 'boolean', - 'anononly' => 'boolean', - 'nocreate' => 'boolean', - 'autoblock' => 'boolean', - 'noemail' => 'boolean', - 'hidden' => 'boolean', - 'allowusertalk' => 'boolean' - ) + 'continue' => 'When more results are available, use this to continue', ); } public function getDescription() { - return 'List all blocked users and IP addresses'; - } - - public function getPossibleErrors() { - global $wgBlockCIDRLimit; - return array_merge( parent::getPossibleErrors(), - $this->getRequireOnlyOneParameterErrorMessages( array( 'users', 'ip' ) ), - array( - array( - 'code' => 'cidrtoobroad', - 'info' => "IPv4 CIDR ranges broader than /{$wgBlockCIDRLimit['IPv4']} are not accepted" - ), - array( - 'code' => 'cidrtoobroad', - 'info' => "IPv6 CIDR ranges broader than /{$wgBlockCIDRLimit['IPv6']} are not accepted" - ), - array( 'code' => 'param_ip', 'info' => 'IP parameter is not valid' ), - array( 'code' => 'param_user', 'info' => 'User parameter may not be empty' ), - array( 'code' => 'param_user', 'info' => 'User name user is not valid' ), - array( 'show' ), - ) - ); + return 'List all blocked users and IP addresses.'; } public function getExamples() { -- cgit v1.2.3-54-g00ecf