[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Completely disable Special:AbuseFilter/tools for non-maintaners
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368553 )
Change subject: Completely disable Special:AbuseFilter/tools for non-maintaners
..
Completely disable Special:AbuseFilter/tools for non-maintaners
As described in the task, anyone can view the page but do nothing
with it. It doesn't make sense, it should either work or be disabled.
I chose the latter.
Bug: T124096
Change-Id: I7271cd5a0d00d5fdba28ce3974c50ea5dfd0ad9b
---
M includes/Views/AbuseFilterViewTools.php
1 file changed, 34 insertions(+), 33 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Views/AbuseFilterViewTools.php
b/includes/Views/AbuseFilterViewTools.php
index 43c..c862561 100644
--- a/includes/Views/AbuseFilterViewTools.php
+++ b/includes/Views/AbuseFilterViewTools.php
@@ -5,6 +5,11 @@
$out = $this->getOutput();
$user = $this->getUser();
+ if ( !$user->isAllowed( 'abusefilter-modify' ) ) {
+ $out->addWikiMsg( 'abusefilter-mustbeeditor' );
+ return;
+ }
+
// Header
$out->addWikiMsg( 'abusefilter-tools-text' );
@@ -12,43 +17,39 @@
$eval = '';
$eval .= AbuseFilter::buildEditBox( '', 'wpTestExpr' );
- // Only let users with permission actually test it
- if ( $user->isAllowed( 'abusefilter-modify' ) ) {
- $eval .= Xml::tags( 'p', null,
- Xml::element( 'input',
- [
- 'type' => 'button',
- 'id' => 'mw-abusefilter-submitexpr',
- 'value' => $this->msg(
'abusefilter-tools-submitexpr' )->text() ]
- )
- );
- $eval .= Xml::element( 'p', [ 'id' =>
'mw-abusefilter-expr-result' ], ' ' );
- }
+ $eval .= Xml::tags( 'p', null,
+ Xml::element( 'input',
+ [
+ 'type' => 'button',
+ 'id' => 'mw-abusefilter-submitexpr',
+ 'value' => $this->msg(
'abusefilter-tools-submitexpr' )->text() ]
+ )
+ );
+ $eval .= Xml::element( 'p', [ 'id' =>
'mw-abusefilter-expr-result' ], ' ' );
+
$eval = Xml::fieldset( $this->msg( 'abusefilter-tools-expr'
)->text(), $eval );
$out->addHTML( $eval );
$out->addModules( 'ext.abuseFilter.tools' );
- if ( $user->isAllowed( 'abusefilter-modify' ) ) {
- // Hacky little box to re-enable autoconfirmed if it
got disabled
- $rac = '';
- $rac .= Xml::inputLabel(
- $this->msg(
'abusefilter-tools-reautoconfirm-user' )->text(),
- 'wpReAutoconfirmUser',
- 'reautoconfirm-user',
- 45
- );
- $rac .= '';
- $rac .= Xml::element(
- 'input',
- [
- 'type' => 'button',
- 'id' =>
'mw-abusefilter-reautoconfirmsubmit',
- 'value' => $this->msg(
'abusefilter-tools-reautoconfirm-submit' )->text()
- ]
- );
- $rac = Xml::fieldset( $this->msg(
'abusefilter-tools-reautoconfirm' )->text(), $rac );
- $out->addHTML( $rac );
- }
+ // Hacky little box to re-enable autoconfirmed if it got
disabled
+ $rac = '';
+ $rac .= Xml::inputLabel(
+ $this->msg( 'abusefilter-tools-reautoconfirm-user'
)->text(),
+ 'wpReAutoconfirmUser',
+ 'reautoconfirm-user',
+ 45
+ );
+ $rac .= '';
+ $rac .= Xml::element(
+ 'input',
+ [
+ 'type' => 'button',
+ 'id' => 'mw-abusefilter-reautoconfirmsubmit',
+ 'value' => $this->msg(
'abusefilter-tools-reautoconfirm-submit' )->text()
+ ]
+ );
+ $rac = Xml::fieldset( $this->msg(
'abusefilter-tools-reautoconfirm' )->text(), $rac );
+ $out->addHTML( $rac );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/368553
To
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Completely disable Special:AbuseFilter/tools for non-maintaners
Matěj Suchánek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368553 )
Change subject: Completely disable Special:AbuseFilter/tools for non-maintaners
..
Completely disable Special:AbuseFilter/tools for non-maintaners
As described in the task, anyone can view the page but do nothing
with it. It doesn't make sense, it should either work or be disabled.
I chose the latter.
Bug: T124096
Change-Id: I7271cd5a0d00d5fdba28ce3974c50ea5dfd0ad9b
---
M Views/AbuseFilterViewTools.php
1 file changed, 34 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/53/368553/1
diff --git a/Views/AbuseFilterViewTools.php b/Views/AbuseFilterViewTools.php
index 43c..c862561 100644
--- a/Views/AbuseFilterViewTools.php
+++ b/Views/AbuseFilterViewTools.php
@@ -5,6 +5,11 @@
$out = $this->getOutput();
$user = $this->getUser();
+ if ( !$user->isAllowed( 'abusefilter-modify' ) ) {
+ $out->addWikiMsg( 'abusefilter-mustbeeditor' );
+ return;
+ }
+
// Header
$out->addWikiMsg( 'abusefilter-tools-text' );
@@ -12,43 +17,39 @@
$eval = '';
$eval .= AbuseFilter::buildEditBox( '', 'wpTestExpr' );
- // Only let users with permission actually test it
- if ( $user->isAllowed( 'abusefilter-modify' ) ) {
- $eval .= Xml::tags( 'p', null,
- Xml::element( 'input',
- [
- 'type' => 'button',
- 'id' => 'mw-abusefilter-submitexpr',
- 'value' => $this->msg(
'abusefilter-tools-submitexpr' )->text() ]
- )
- );
- $eval .= Xml::element( 'p', [ 'id' =>
'mw-abusefilter-expr-result' ], ' ' );
- }
+ $eval .= Xml::tags( 'p', null,
+ Xml::element( 'input',
+ [
+ 'type' => 'button',
+ 'id' => 'mw-abusefilter-submitexpr',
+ 'value' => $this->msg(
'abusefilter-tools-submitexpr' )->text() ]
+ )
+ );
+ $eval .= Xml::element( 'p', [ 'id' =>
'mw-abusefilter-expr-result' ], ' ' );
+
$eval = Xml::fieldset( $this->msg( 'abusefilter-tools-expr'
)->text(), $eval );
$out->addHTML( $eval );
$out->addModules( 'ext.abuseFilter.tools' );
- if ( $user->isAllowed( 'abusefilter-modify' ) ) {
- // Hacky little box to re-enable autoconfirmed if it
got disabled
- $rac = '';
- $rac .= Xml::inputLabel(
- $this->msg(
'abusefilter-tools-reautoconfirm-user' )->text(),
- 'wpReAutoconfirmUser',
- 'reautoconfirm-user',
- 45
- );
- $rac .= '';
- $rac .= Xml::element(
- 'input',
- [
- 'type' => 'button',
- 'id' =>
'mw-abusefilter-reautoconfirmsubmit',
- 'value' => $this->msg(
'abusefilter-tools-reautoconfirm-submit' )->text()
- ]
- );
- $rac = Xml::fieldset( $this->msg(
'abusefilter-tools-reautoconfirm' )->text(), $rac );
- $out->addHTML( $rac );
- }
+ // Hacky little box to re-enable autoconfirmed if it got
disabled
+ $rac = '';
+ $rac .= Xml::inputLabel(
+ $this->msg( 'abusefilter-tools-reautoconfirm-user'
)->text(),
+ 'wpReAutoconfirmUser',
+ 'reautoconfirm-user',
+ 45
+ );
+ $rac .= '';
+ $rac .= Xml::element(
+ 'input',
+ [
+ 'type' => 'button',
+ 'id' => 'mw-abusefilter-reautoconfirmsubmit',
+ 'value' => $this->msg(
'abusefilter-tools-reautoconfirm-submit' )->text()
+ ]
+ );
+ $rac = Xml::fieldset( $this->msg(
'abusefilter-tools-reautoconfirm' )->text(), $rac );
+ $out->addHTML( $rac );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/368553
To unsubscribe, visit
