Hoo man has submitted this change and it was merged.
Change subject: Create variable to set length of IP blocks
......................................................................
Create variable to set length of IP blocks
This creates a $wgAbuseFilterAnonBlockDuration, which
allows for IP blocks to have a different length.
For backwards compatability this is default set to
$wgAbuseFilterBlockDuration.
Change-Id: Ibfd5c9639317150442f745a5759f3c34b38de274
---
M AbuseFilter.class.php
M AbuseFilter.php
2 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 41c1636..968572c 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -1177,7 +1177,7 @@
break;
case 'block':
- global $wgUser, $wgAbuseFilterBlockDuration;
+ global $wgUser, $wgAbuseFilterBlockDuration,
$wgAbuseFilterAnonBlockDuration;
$filterUser = AbuseFilter::getFilterUser();
// Create a block.
@@ -1192,8 +1192,9 @@
$block->isAutoblocking( true );
$block->prevents( 'createaccount', true );
$block->prevents( 'editownusertalk', false );
- $block->mExpiry =
SpecialBlock::parseExpiryInput( $wgAbuseFilterBlockDuration );
+ $expiry = $wgUser->isAnon() ?
$wgAbuseFilterAnonBlockDuration : $wgAbuseFilterBlockDuration;
+ $block->mExpiry =
SpecialBlock::parseExpiryInput( $expiry );
$block->insert();
// Log it
@@ -1202,7 +1203,7 @@
if ( $block->mExpiry == 'infinity' ) {
$logParams[] = 'indefinite';
} else {
- $logParams[] =
$wgAbuseFilterBlockDuration;
+ $logParams[] = $expiry;
}
$logParams[] = 'nocreate';
diff --git a/AbuseFilter.php b/AbuseFilter.php
index d5f0a76..dd30463 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -185,8 +185,10 @@
// block, remove from groups, or revoke permissions
$wgAbuseFilterDisallowGlobalLocalBlocks = false;
-// Block duration
+// Block duration for logged in users
$wgAbuseFilterBlockDuration = 'indefinite';
+// Block duration for anonymous users
+$wgAbuseFilterAnonBlockDuration = $wgAbuseFilterBlockDuration;
// Callback functions for custom actions
$wgAbuseFilterCustomActionsHandlers = array();
--
To view, visit https://gerrit.wikimedia.org/r/48114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfd5c9639317150442f745a5759f3c34b38de274
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
