require_once __DIR__ . '/Maintenance.php';
+use MediaWiki\Block\DatabaseBlock;
+
/**
* Maintenance script to clean up user blocks with user names not matching the
* 'user' table.
public function execute() {
$db = $this->getDB( DB_MASTER );
+ $blockQuery = DatabaseBlock::getQueryInfo();
$max = $db->selectField( 'ipblocks', 'MAX(ipb_user)' );
// Step 1: Clean up any duplicate user blocks
- for ( $from = 1; $from <= $max; $from += $this->mBatchSize ) {
- $to = min( $max, $from + $this->mBatchSize - 1 );
+ $batchSize = $this->getBatchSize();
+ for ( $from = 1; $from <= $max; $from += $batchSize ) {
+ $to = min( $max, $from + $batchSize - 1 );
$this->output( "Cleaning up duplicate ipb_user ($from-$to of $max)\n" );
$delete = [];
'ipblocks',
[ 'ipb_user' ],
[
- "ipb_user >= $from",
- "ipb_user <= $to",
+ "ipb_user >= " . (int)$from,
+ "ipb_user <= " . (int)$to,
],
__METHOD__,
[
foreach ( $res as $row ) {
$bestBlock = null;
$res2 = $db->select(
- 'ipblocks',
- '*',
+ $blockQuery['tables'],
+ $blockQuery['fields'],
[
'ipb_user' => $row->ipb_user,
- ]
+ ],
+ __METHOD__,
+ [],
+ $blockQuery['joins']
);
foreach ( $res2 as $row2 ) {
- $block = Block::newFromRow( $row2 );
+ $block = DatabaseBlock::newFromRow( $row2 );
if ( !$bestBlock ) {
$bestBlock = $block;
continue;
}
// Find the most-restrictive block. Can't use
- // Block::chooseBlock because that's for IP blocks, not
+ // DatabaseBlock::chooseBlock because that's for IP blocks, not
// user blocks.
$keep = null;
if ( $keep === null && $block->getExpiry() !== $bestBlock->getExpiry() ) {
$keep = $block->getExpiry() > $bestBlock->getExpiry();
}
if ( $keep === null ) {
- foreach ( [ 'createaccount', 'sendemail', 'editownusertalk' ] as $action ) {
- if ( $block->prevents( $action ) xor $bestBlock->prevents( $action ) ) {
- $keep = $block->prevents( $action );
- break;
- }
+ if ( $block->isCreateAccountBlocked() xor $bestBlock->isCreateAccountBlocked() ) {
+ $keep = $block->isCreateAccountBlocked();
+ } elseif ( $block->isEmailBlocked() xor $bestBlock->isEmailBlocked() ) {
+ $keep = $block->isEmailBlocked();
+ } elseif ( $block->isUsertalkEditAllowed() xor $bestBlock->isUsertalkEditAllowed() ) {
+ $keep = $block->isUsertalkEditAllowed();
}
}
}
// Step 2: Update the user name in any blocks where it doesn't match
- for ( $from = 1; $from <= $max; $from += $this->mBatchSize ) {
- $to = min( $max, $from + $this->mBatchSize - 1 );
+ for ( $from = 1; $from <= $max; $from += $batchSize ) {
+ $to = min( $max, $from + $batchSize - 1 );
$this->output( "Cleaning up mismatched user name ($from-$to of $max)\n" );
$res = $db->select(
[ 'ipb_id', 'user_name' ],
[
'ipb_user = user_id',
- "ipb_user >= $from",
- "ipb_user <= $to",
+ "ipb_user >= " . (int)$from,
+ "ipb_user <= " . (int)$to,
'ipb_address != user_name',
],
__METHOD__
}
}
-$maintClass = "CleanupBlocks";
+$maintClass = CleanupBlocks::class;
require_once RUN_MAINTENANCE_IF_MAIN;