Hoo man has submitted this change and it was merged.
Change subject: Add triggered filter id as parameter to messages
......................................................................
Add triggered filter id as parameter to messages
Bug: 50464
Change-Id: I82f1c7f021c8d95fe50fd4da4bc57a8850bbbb84
---
M AbuseFilter.class.php
M AbuseFilter.i18n.php
2 files changed, 38 insertions(+), 24 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
jenkins-bot: Checked
Objections:
Siebrand: There's a problem with this change, please improve
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index b067ed5..77deaa4 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -787,7 +787,8 @@
foreach ( $actions as $action => $info ) {
$newMsg = self::takeConsequenceAction(
$action, $info['parameters'], $title,
$vars,
-
self::$filters[$filter]->af_public_comments
+
self::$filters[$filter]->af_public_comments,
+ $filter
);
if ( $newMsg !== null ) {
@@ -1196,6 +1197,7 @@
* @param $title Title
* @param $vars AbuseFilterVariableHolder
* @param $rule_desc
+ * @param $rule_number int|string
*
* @return array|null a message describing the action that was taken,
* or null if no action was taken. The message is given as an
array
@@ -1207,7 +1209,7 @@
* not accept Message objects to be added directly.
*/
public static function takeConsequenceAction( $action, $parameters,
$title,
- $vars, $rule_desc )
+ $vars, $rule_desc, $rule_number )
{
global $wgAbuseFilterCustomActionsHandlers, $wgRequest;
@@ -1216,12 +1218,13 @@
switch ( $action ) {
case 'disallow':
if ( strlen( $parameters[0] ) ) {
- $message = array( $parameters[0],
$rule_desc );
+ $message = array( $parameters[0],
$rule_desc, $rule_number );
} else {
// Generic message.
$message = array(
'abusefilter-disallowed',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
}
break;
@@ -1236,7 +1239,8 @@
$block->setBlocker( $filterUser );
$block->mReason = wfMessage(
'abusefilter-blockreason',
- $rule_desc
+ $rule_desc,
+ $rule_number
)->inContentLanguage()->text();
$block->isHardblock( false );
$block->isAutoblocking( true );
@@ -1266,13 +1270,14 @@
$log = new LogPage( 'block' );
$log->addEntry( 'block',
Title::makeTitle( NS_USER,
$wgUser->getName() ),
- wfMessage( 'abusefilter-blockreason',
$rule_desc )->inContentLanguage()->text(),
+ wfMessage( 'abusefilter-blockreason',
$rule_desc, $rule_number )->inContentLanguage()->text(),
$logParams, self::getFilterUser()
);
$message = array(
'abusefilter-blocked-display',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
break;
case 'rangeblock':
@@ -1286,7 +1291,8 @@
$block->setBlocker( $filterUser );
$block->mReason = wfMessage(
'abusefilter-blockreason',
- $rule_desc
+ $rule_desc,
+ $rule_number
)->inContentLanguage()->text();
$block->isHardblock( false );
$block->prevents( 'createaccount', true );
@@ -1303,13 +1309,14 @@
$log = new LogPage( 'block' );
$log->addEntry( 'block', Title::makeTitle(
NS_USER, $range ),
- wfMessage( 'abusefilter-blockreason',
$rule_desc )->inContentLanguage()->text(),
+ wfMessage( 'abusefilter-blockreason',
$rule_desc, $rule_number )->inContentLanguage()->text(),
$logParams, self::getFilterUser()
);
$message = array(
'abusefilter-blocked-display',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
break;
case 'degroup':
@@ -1324,7 +1331,8 @@
$message = array(
'abusefilter-degrouped',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
// Don't log it if there aren't any
groups being removed!
@@ -1337,7 +1345,7 @@
$log->addEntry( 'rights',
$wgUser->getUserPage(),
- wfMessage(
'abusefilter-degroupreason', $rule_desc )->inContentLanguage()->text(),
+ wfMessage(
'abusefilter-degroupreason', $rule_desc, $rule_number
)->inContentLanguage()->text(),
array(
implode( ', ', $groups
),
''
@@ -1355,7 +1363,8 @@
$message = array(
'abusefilter-autopromote-blocked',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
}
break;
@@ -1379,7 +1388,7 @@
if( isset(
$wgAbuseFilterCustomActionsHandlers[$action] ) ) {
$custom_function =
$wgAbuseFilterCustomActionsHandlers[$action];
if( is_callable( $custom_function ) ) {
- $msg = call_user_func(
$custom_function, $action, $parameters, $title, $vars, $rule_desc );
+ $msg = call_user_func(
$custom_function, $action, $parameters, $title, $vars, $rule_desc, $rule_number
);
}
if( isset( $msg ) ) {
$message = array( $msg );
diff --git a/AbuseFilter.i18n.php b/AbuseFilter.i18n.php
index dee08ae..7112efe 100644
--- a/AbuseFilter.i18n.php
+++ b/AbuseFilter.i18n.php
@@ -533,22 +533,27 @@
'abusefilter-intro' => 'Introduction text for the list of filter
rules.',
'abusefilter-mustbeeditor' => '"No access" message shown when a user
does not have access rights.',
'abusefilter-warning' => 'A warning message shown when a user tries to
save an edit which matches some abuse filter rule. Parameters:
-* $1 is a short description of the abuse filter rule which triggered this
action.',
+* $1 is a short description of the abuse filter rule which triggered this
action
+* $2 is the filter id',
'abusefilter-disallowed' => 'Message given to user because of a
triggered filter. Parameters:
-* $1 is a filter description.',
+* $1 is a filter description
+* $2 is the filter id',
'abusefilter-blocked-display' => 'Message given to user because of a
triggered filter. Parameters:
-* * $1 is a filter description.',
+* $1 is a filter description
+* $2 is the filter id',
'abusefilter-degrouped' => 'Message given to user because of a
triggered filter. Parameters:
-* * $1 is a filter description.',
+* $1 is a filter description
+* $2 is the filter id',
'abusefilter-autopromote-blocked' => 'Message given to user because of
a triggered filter. Parameters:
-* $1 is a filter description.',
+* $1 is a filter description
+* $2 is the filter id',
'abusefilter-blocker' => 'Username of reserved user for abuse filter
actions.',
'abusefilter-blockreason' => 'Message given to user because of a
triggered filter. Parameters:
-* $1 is a filter description.',
- 'abusefilter-degroupreason' => 'Used as log entry when removal of the
user from all privileged groups performed by Abuse filter.
-
-Parameters:
-* $1 - rule description (reason)',
+* $1 is a filter description
+* $2 is the filter id',
+ 'abusefilter-degroupreason' => 'Used as log entry when removal of the
user from all privileged groups performed by Abuse filter. Parameters:
+* $1 is the filter description (reason)
+* $2 is the filter id',
'abusefilter-accountreserved' => 'Message given when trying to register
a reserved account name for AbuseFilter actions.',
'right-abusefilter-modify' => '{{doc-right|abusefilter-modify}}',
'right-abusefilter-view' => '{{doc-right|abusefilter-view}}',
--
To view, visit https://gerrit.wikimedia.org/r/71291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82f1c7f021c8d95fe50fd4da4bc57a8850bbbb84
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Se4598 <se4...@gmx.de>
Gerrit-Reviewer: Helder.wiki <helder.w...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Se4598 <se4...@gmx.de>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
