From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/api/ApiQueryBlocks.php | 86 +++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 42 deletions(-) (limited to 'includes/api/ApiQueryBlocks.php') diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index 4edda645..503af7c7 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -1,10 +1,10 @@ .@home.nl + * Copyright © 2007 Roan Kattouw .@gmail.com * * 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 @@ -30,30 +30,33 @@ if ( !defined( 'MEDIAWIKI' ) ) { } /** - * Query module to enumerate all available pages. + * Query module to enumerate all user blocks * * @ingroup API */ class ApiQueryBlocks extends ApiQueryBase { - var $users; + /** + * @var Array + */ + protected $usernames; public function __construct( $query, $moduleName ) { parent::__construct( $query, $moduleName, 'bk' ); } public function execute() { - global $wgUser; + global $wgUser, $wgContLang; $params = $this->extractRequestParams(); - if ( isset( $params['users'] ) && isset( $params['ip'] ) ) { - $this->dieUsage( 'bkusers and bkip cannot be used together', 'usersandip' ); - } + $this->requireMaxOneParameter( $params, 'users', 'ip' ); $prop = array_flip( $params['prop'] ); $fld_id = isset( $prop['id'] ); $fld_user = isset( $prop['user'] ); + $fld_userid = isset( $prop['userid'] ); $fld_by = isset( $prop['by'] ); + $fld_byid = isset( $prop['byid'] ); $fld_timestamp = isset( $prop['timestamp'] ); $fld_expiry = isset( $prop['expiry'] ); $fld_reason = isset( $prop['reason'] ); @@ -65,35 +68,20 @@ class ApiQueryBlocks extends ApiQueryBase { $this->addTables( 'ipblocks' ); $this->addFields( 'ipb_auto' ); - if ( $fld_id ) { - $this->addFields( 'ipb_id' ); - } - if ( $fld_user ) { - $this->addFields( array( 'ipb_address', 'ipb_user' ) ); - } - if ( $fld_by ) { - $this->addTables( 'user' ); - $this->addFields( array( 'ipb_by', 'user_name' ) ); - $this->addWhere( 'user_id = ipb_by' ); - } - if ( $fld_timestamp ) { - $this->addFields( 'ipb_timestamp' ); - } - if ( $fld_expiry ) { - $this->addFields( 'ipb_expiry' ); - } - if ( $fld_reason ) { - $this->addFields( 'ipb_reason' ); - } - if ( $fld_range ) { - $this->addFields( array( 'ipb_range_start', 'ipb_range_end' ) ); - } - if ( $fld_flags ) { - $this->addFields( array( 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ) ); - } + $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 ); + $this->addFieldsIf( 'ipb_timestamp', $fld_timestamp ); + $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', + 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ), + $fld_flags ); $this->addOption( 'LIMIT', $params['limit'] + 1 ); - $this->addWhereRange( 'ipb_timestamp', $params['dir'], $params['start'], $params['end'] ); + $this->addTimestampWhereRange( 'ipb_timestamp', $params['dir'], $params['start'], $params['end'] ); if ( isset( $params['ids'] ) ) { $this->addWhereFld( 'ipb_id', $params['ids'] ); } @@ -151,14 +139,20 @@ class ApiQueryBlocks extends ApiQueryBase { if ( $fld_user && !$row->ipb_auto ) { $block['user'] = $row->ipb_address; } + if ( $fld_userid && !$row->ipb_auto ) { + $block['userid'] = $row->ipb_user; + } if ( $fld_by ) { - $block['by'] = $row->user_name; + $block['by'] = $row->ipb_by_text; + } + if ( $fld_byid ) { + $block['byid'] = $row->ipb_by; } if ( $fld_timestamp ) { $block['timestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp ); } if ( $fld_expiry ) { - $block['expiry'] = Block::decodeExpiry( $row->ipb_expiry, TS_ISO_8601 ); + $block['expiry'] = $wgContLang->formatExpiry( $row->ipb_expiry, TS_ISO_8601 ); } if ( $fld_reason ) { $block['reason'] = $row->ipb_reason; @@ -248,7 +242,9 @@ class ApiQueryBlocks extends ApiQueryBase { ApiBase::PARAM_TYPE => array( 'id', 'user', + 'userid', 'by', + 'byid', 'timestamp', 'expiry', 'reason', @@ -264,7 +260,7 @@ class ApiQueryBlocks extends ApiQueryBase { return array( 'start' => 'The timestamp to start enumerating from', 'end' => 'The timestamp to stop enumerating at', - 'dir' => 'The direction in which to enumerate', + 'dir' => $this->getDirectionDescription( $this->getModulePrefix() ), 'ids' => 'Pipe-separated list of block IDs to list (optional)', 'users' => 'Pipe-separated list of users to search for (optional)', 'ip' => array( 'Get all blocks applying to this IP or CIDR range, including range blocks.', @@ -272,9 +268,11 @@ class ApiQueryBlocks extends ApiQueryBase { 'limit' => 'The maximum amount of blocks to list', 'prop' => array( 'Which properties to get', - ' id - Adds the id of the block', + ' id - Adds the ID of the block', ' user - Adds the username of the blocked user', - ' by - Adds the username of the blocking admin', + ' userid - Adds the user ID of the blocked user', + ' by - Adds the username of the blocking user', + ' byid - Adds the user ID of the blocking user', ' timestamp - Adds the timestamp of when the block was given', ' expiry - Adds the timestamp of when the block expires', ' reason - Adds the reason given for the block', @@ -290,7 +288,7 @@ class ApiQueryBlocks extends ApiQueryBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'code' => 'usersandip', 'info' => 'bkusers and bkip cannot be used together' ), + $this->getRequireOnlyOneParameterErrorMessages( array( 'users', 'ip' ) ), array( 'code' => 'cidrtoobroad', 'info' => 'CIDR ranges broader than /16 are not accepted' ), array( 'code' => 'param_user', 'info' => 'User parameter may not be empty' ), array( 'code' => 'param_user', 'info' => 'User name user is not valid' ), @@ -304,7 +302,11 @@ class ApiQueryBlocks extends ApiQueryBase { ); } + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/API:Blocks'; + } + public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryBlocks.php 73858 2010-09-28 01:21:15Z reedy $'; + return __CLASS__ . ': $Id: ApiQueryBlocks.php 104449 2011-11-28 15:52:04Z reedy $'; } } -- cgit v1.2.2