* @ingroup SpecialPage
*/
+use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\Block\Restriction\NamespaceRestriction;
use MediaWiki\MediaWikiServices;
*/
class SpecialBlock extends FormSpecialPage {
/** @var User|string|null User to be blocked, as passed either by parameter (url?wpTarget=Foo)
- * or as subpage (Special:Block/Foo) */
+ * or as subpage (Special:Block/Foo)
+ */
protected $target;
- /** @var int Block::TYPE_ constant */
+ /** @var int DatabaseBlock::TYPE_ constant */
protected $type;
/** @var User|string The previous block target */
}
list( $this->previousTarget, /*...*/ ) =
- Block::parseTarget( $request->getVal( 'wpPreviousTarget' ) );
+ DatabaseBlock::parseTarget( $request->getVal( 'wpPreviousTarget' ) );
$this->requestedHideUser = $request->getBool( 'wpHideUser' );
}
# This won't be
$fields['PreviousTarget']['default'] = (string)$this->target;
- $block = Block::newFromTarget( $this->target );
+ $block = DatabaseBlock::newFromTarget( $this->target );
// Populate fields if there is a block that is not an autoblock; if it is a range
// block, only populate the fields if the range is the same as $this->target
- if ( $block instanceof Block && $block->getType() !== Block::TYPE_AUTO
- && ( $this->type != Block::TYPE_RANGE
+ if ( $block instanceof DatabaseBlock && $block->getType() !== DatabaseBlock::TYPE_AUTO
+ && ( $this->type != DatabaseBlock::TYPE_RANGE
|| $block->getTarget() == $this->target )
) {
$fields['HardBlock']['default'] = $block->isHardblock();
}
if ( $this->getConfig()->get( 'EnablePartialBlocks' ) ) {
- if ( $block instanceof Block && !$block->isSitewide() ) {
+ if ( $block instanceof DatabaseBlock && !$block->isSitewide() ) {
$fields['EditingRestriction']['default'] = 'partial';
} else {
$fields['EditingRestriction']['default'] = 'sitewide';
}
- if ( $block instanceof Block ) {
+ if ( $block instanceof DatabaseBlock ) {
$pageRestrictions = [];
$namespaceRestrictions = [];
foreach ( $block->getRestrictions() as $restriction ) {
/**
* Determine the target of the block, and the type of target
- * @todo Should be in Block.php?
+ * @todo Should be in DatabaseBlock.php?
* @param string $par Subpage parameter passed to setup, or data value from
* the HTMLForm
* @param WebRequest|null $request Optionally try and get data from a request too
- * @return array [ User|string|null, Block::TYPE_ constant|null ]
+ * @return array [ User|string|null, DatabaseBlock::TYPE_ constant|null ]
* @phan-return array{0:User|string|null,1:int|null}
*/
public static function getTargetAndType( $par, WebRequest $request = null ) {
break 2;
}
- list( $target, $type ) = Block::parseTarget( $target );
+ list( $target, $type ) = DatabaseBlock::parseTarget( $target );
if ( $type !== null ) {
return [ $target, $type ];
list( $target, $type ) = self::getTargetAndType( $value );
$status = Status::newGood( $target );
- if ( $type == Block::TYPE_USER ) {
+ if ( $type == DatabaseBlock::TYPE_USER ) {
if ( $target->isAnon() ) {
$status->fatal(
'nosuchusershort',
if ( $unblockStatus !== true ) {
$status->fatal( 'badaccess', $unblockStatus );
}
- } elseif ( $type == Block::TYPE_RANGE ) {
+ } elseif ( $type == DatabaseBlock::TYPE_RANGE ) {
list( $ip, $range ) = explode( '/', $target, 2 );
if (
if ( IP::isIPv6( $ip ) && $range < $wgBlockCIDRLimit['IPv6'] ) {
$status->fatal( 'ip_range_toolarge', $wgBlockCIDRLimit['IPv6'] );
}
- } elseif ( $type == Block::TYPE_IP ) {
+ } elseif ( $type == DatabaseBlock::TYPE_IP ) {
# All is well
} else {
$status->fatal( 'badipaddress' );
*
* @param array $data
* @param IContextSource $context
- * @return bool|string
+ * @return bool|array
*/
public static function processForm( array $data, IContextSource $context ) {
- global $wgBlockAllowsUTEdit, $wgHideUserContribLimit;
-
$performer = $context->getUser();
$enablePartialBlocks = $context->getConfig()->get( 'EnablePartialBlocks' );
$isPartialBlock = $enablePartialBlocks &&
isset( $data['EditingRestriction'] ) &&
$data['EditingRestriction'] === 'partial';
- // Handled by field validator callback
- // self::validateTargetField( $data['Target'] );
-
# This might have been a hidden field or a checkbox, so interesting data
# can come from it
$data['Confirm'] = !in_array( $data['Confirm'], [ '', '0', null, false ], true );
/** @var User $target */
list( $target, $type ) = self::getTargetAndType( $data['Target'] );
- if ( $type == Block::TYPE_USER ) {
+ if ( $type == DatabaseBlock::TYPE_USER ) {
$user = $target;
$target = $user->getName();
$userId = $user->getId();
) {
return [ 'ipb-blockingself', 'ipb-confirmaction' ];
}
- } elseif ( $type == Block::TYPE_RANGE ) {
+ } elseif ( $type == DatabaseBlock::TYPE_RANGE ) {
$user = null;
$userId = 0;
- } elseif ( $type == Block::TYPE_IP ) {
+ } elseif ( $type == DatabaseBlock::TYPE_IP ) {
$user = null;
$target = $target->getName();
$userId = 0;
}
# Recheck params here...
- if ( $type != Block::TYPE_USER ) {
+ $hideUserContribLimit = $context->getConfig()->get( 'HideUserContribLimit' );
+ if ( $type != DatabaseBlock::TYPE_USER ) {
$data['HideUser'] = false; # IP users should not be hidden
} elseif ( !wfIsInfinity( $data['Expiry'] ) ) {
# Bad expiry.
return [ 'ipb_expiry_temp' ];
- } elseif ( $wgHideUserContribLimit !== false
- && $user->getEditCount() > $wgHideUserContribLimit
+ } elseif ( $hideUserContribLimit !== false
+ && $user->getEditCount() > $hideUserContribLimit
) {
# Typically, the user should have a handful of edits.
# Disallow hiding users with many edits for performance.
return [ [ 'ipb_hide_invalid',
- Message::numParam( $wgHideUserContribLimit ) ] ];
+ Message::numParam( $hideUserContribLimit ) ] ];
} elseif ( !$data['Confirm'] ) {
return [ 'ipb-confirmhideuser', 'ipb-confirmaction' ];
}
}
+ $blockAllowsUTEdit = $context->getConfig()->get( 'BlockAllowsUTEdit' );
+ $userTalkEditAllowed = !$blockAllowsUTEdit || !$data['DisableUTEdit'];
+ if ( !$userTalkEditAllowed &&
+ $isPartialBlock &&
+ !in_array( NS_USER_TALK, explode( "\n", $data['NamespaceRestrictions'] ) )
+ ) {
+ return [ 'ipb-prevent-user-talk-edit' ];
+ }
+
# Create block object.
- $block = new Block();
+ $block = new DatabaseBlock();
$block->setTarget( $target );
$block->setBlocker( $performer );
$block->setReason( $data['Reason'][0] );
$block->setExpiry( $expiryTime );
$block->isCreateAccountBlocked( $data['CreateAccount'] );
- $block->isUsertalkEditAllowed( !$wgBlockAllowsUTEdit || !$data['DisableUTEdit'] );
+ $block->isUsertalkEditAllowed( $userTalkEditAllowed );
$block->isEmailBlocked( $data['DisableEmail'] );
$block->isHardblock( $data['HardBlock'] );
$block->isAutoblocking( $data['AutoBlock'] );
} else {
# This returns direct blocks before autoblocks/rangeblocks, since we should
# be sure the user is blocked by now it should work for our purposes
- $currentBlock = Block::newFromTarget( $target );
+ $currentBlock = DatabaseBlock::newFromTarget( $target );
if ( $block->equals( $currentBlock ) ) {
return [ [ 'ipb_already_blocked', $block->getTarget() ] ];
}
}
# Can't watch a rangeblock
- if ( $type != Block::TYPE_RANGE && $data['Watch'] ) {
+ if ( $type != DatabaseBlock::TYPE_RANGE && $data['Watch'] ) {
WatchAction::doWatch(
Title::makeTitle( NS_USER, $target ),
$performer,
);
}
- # Block constructor sanitizes certain block options on insert
+ # DatabaseBlock constructor sanitizes certain block options on insert
$data['BlockEmail'] = $block->isEmailBlocked();
$data['AutoBlock'] = $block->isAutoblocking();
if ( $performer->getBlock() ) {
if ( $target instanceof User && $target->getId() == $performer->getId() ) {
# User is trying to unblock themselves
- // @TODO Ensure that the block does not apply to the `unblockself`
- // right.
if ( $performer->isAllowed( 'unblockself' ) ) {
return true;
# User blocked themselves and is now trying to reverse it
}
} elseif (
$target instanceof User &&
- $performer->getBlock() instanceof Block &&
+ $performer->getBlock() instanceof DatabaseBlock &&
$performer->getBlock()->getBy() &&
$performer->getBlock()->getBy() === $target->getId()
) {
* Return a comma-delimited list of "flags" to be passed to the log
* reader for this block, to provide more information in the logs
* @param array $data From HTMLForm data
- * @param int $type Block::TYPE_ constant (USER, RANGE, or IP)
+ * @param int $type DatabaseBlock::TYPE_ constant (USER, RANGE, or IP)
* @return string
*/
protected static function blockLogFlags( array $data, $type ) {
# when blocking a user the option 'anononly' is not available/has no effect
# -> do not write this into log
- if ( !$data['HardBlock'] && $type != Block::TYPE_USER ) {
+ if ( !$data['HardBlock'] && $type != DatabaseBlock::TYPE_USER ) {
// For grepping: message block-log-flags-anononly
$flags[] = 'anononly';
}
}
# Same as anononly, this is not displayed when blocking an IP address
- if ( !$data['AutoBlock'] && $type == Block::TYPE_USER ) {
+ if ( !$data['AutoBlock'] && $type == DatabaseBlock::TYPE_USER ) {
// For grepping: message block-log-flags-noautoblock
$flags[] = 'noautoblock';
}
dépôts / lhc / web / wiklou.git / blobdiff