mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git
synced 2024-09-24 02:38:16 +00:00
Revert r41145. Restoring autoconfirmed should really have access control, eh?
This commit is contained in:
parent
d0972206f3
commit
a374d100ff
|
@ -91,14 +91,6 @@ class AbuseFilter {
|
|||
return $parser->evaluateExpression( $expr );
|
||||
}
|
||||
|
||||
public static function ajaxReAutoconfirm( $username ) {
|
||||
$u = User::newFromName( $username );
|
||||
|
||||
global $wgMemc;
|
||||
$k = AbuseFilter::autoPromoteBlockKey($u);
|
||||
$wgMemc->delete( $k );
|
||||
}
|
||||
|
||||
public static function ajaxEvaluateExpression( $expr ) {
|
||||
return self::evaluateExpression( $expr );
|
||||
}
|
||||
|
|
|
@ -103,9 +103,6 @@ A brief description of the abuse rule which your action matched is: $1",
|
|||
'abusefilter-tools-text' => 'Here are some tools which may be useful in formulating and debugging abuse filters. [[Special:AbuseFilter|Return to main menu]]',
|
||||
'abusefilter-tools-expr' => 'Expression tester',
|
||||
'abusefilter-tools-submitexpr' => 'Evaluate',
|
||||
'abusefilter-tools-reautoconfirm' => 'Restore autoconfirmed status',
|
||||
'abusefilter-tools-reautoconfirm-user' => 'User',
|
||||
'abusefilter-tools-reautoconfirm-submit' => 'Re-autoconfirm',
|
||||
|
||||
// Abuse filter status
|
||||
'abusefilter-status' => "Of the last $1 {{PLURAL:$1|action|actions}}, $2 ($3%) {{PLURAL:$2|has|have}} reached the condition limit of $4. $5 ($6%) {{PLURAL:$5|has|have}} matched one of the filters currently enabled.",
|
||||
|
|
|
@ -69,5 +69,4 @@ $wgAbuseFilterNativeSyntaxCheck = "$dir/parser_native/syntax_check";
|
|||
$wgAbuseFilterNativeExpressionEvaluator = "$dir/parser_native/af_expr";
|
||||
|
||||
$wgAjaxExportList[] = 'AbuseFilter::ajaxCheckSyntax';
|
||||
$wgAjaxExportList[] = 'AbuseFilter::ajaxEvaluateExpression';
|
||||
$wgAjaxExportList[] = 'AbuseFilter::ajaxReAutoconfirm';
|
||||
$wgAjaxExportList[] = 'AbuseFilter::ajaxEvaluateExpression';
|
|
@ -152,28 +152,9 @@ class SpecialAbuseFilter extends SpecialPage {
|
|||
|
||||
var el = document.getElementById( 'mw-abusefilter-expr-result' );
|
||||
changeText( el, response );
|
||||
}
|
||||
function doReautoSubmit()
|
||||
{
|
||||
var name = document.getElementById('reautoconfirm-user').value;
|
||||
injectSpinner( document.getElementById( 'mw-abusefilter-reautoconfirmsubmit' ), 'abusefilter-reautoconfirm' );
|
||||
sajax_do_call( 'AbuseFilter::ajaxReAutoconfirm', [name], processReautoconfirm );
|
||||
}
|
||||
function processReautoconfirm( request ) {
|
||||
var response = request.responseText;
|
||||
|
||||
removeSpinner( 'abusefilter-reautoconfirm' );
|
||||
}
|
||||
";
|
||||
}";
|
||||
|
||||
$wgOut->addInlineScript( $exprScript );
|
||||
|
||||
// Hacky little box to re-enable autoconfirmed if it got disabled
|
||||
$rac = '';
|
||||
$rac .= Xml::inputLabel( wfMsg( 'abusefilter-tools-reautoconfirm-user' ), 'wpReAutoconfirmUser', 'reautoconfirm-user', 45 );
|
||||
$rac .= Xml::element( 'input', array( 'type' => 'button', 'id' => 'mw-abusefilter-reautoconfirmsubmit', 'onclick' => 'doReautoSubmit();', 'value' => wfMsg( 'abusefilter-tools-reautoconfirm-submit' ) ) );
|
||||
$rac = Xml::fieldset( wfMsg( 'abusefilter-tools-reautoconfirm' ), $rac );
|
||||
$wgOut->addHtml( $rac );
|
||||
}
|
||||
|
||||
function showStatus() {
|
||||
|
|
|
@ -59,7 +59,6 @@ CREATE TABLE /*$wgDBprefix*/abuse_filter_history (
|
|||
afh_flags TINYBLOB NOT NULL,
|
||||
afh_public_comments TINYBLOB,
|
||||
afh_actions BLOB,
|
||||
afh_deleted tinyint(1) NOT NULL DEFAULT 0,
|
||||
|
||||
PRIMARY KEY (afh_id),
|
||||
KEY (afh_filter),
|
||||
|
|
Loading…
Reference in a new issue