wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-28 07:50:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Disallow editing abuse filters for blocked users"

Browse source
This commit is contained in:
jenkins-bot 2017-04-11 18:35:19 +00:00 committed by Gerrit Code Review
parent a5e5e9d739 0b956a0d07
commit a6a93a9037
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Views/AbuseFilterView.php
View file

@ -35,7 +35,10 @@ abstract class AbuseFilterView extends ContextSource {
* @return bool
*/
public function canEdit() {
return $this->getUser()->isAllowed( 'abusefilter-modify' );
return (
!$this->getUser()->isBlocked() &&
$this->getUser()->isAllowed( 'abusefilter-modify' )
);
}
/**

15
Views/AbuseFilterViewEdit.php
View file

@ -24,16 +24,16 @@ class AbuseFilterViewEdit extends AbuseFilterView {
// Add default warning messages
$this->exposeWarningMessages();
if ( $filter == 'new' && !$user->isAllowed( 'abusefilter-modify' ) ) {
if ( $filter == 'new' && !$this->canEdit() ) {
$out->addWikiMsg( 'abusefilter-edit-notallowed' );
return;
}
$editToken = $request->getVal( 'wpEditToken' );
$didEdit = $this->canEdit()
&& $user->matchEditToken( $editToken, array( 'abusefilter', $filter ) );
$tokenMatches = $user->matchEditToken(
$editToken, array( 'abusefilter', $filter ), $request );
if ( $didEdit ) {
if ( $tokenMatches && $this->canEdit() ) {
// Check syntax
$syntaxerr = AbuseFilter::checkSyntax( $request->getVal( 'wpFilterRules' ) );
if ( $syntaxerr !== true ) {
@ -268,6 +268,11 @@ class AbuseFilterViewEdit extends AbuseFilterView {
)
);
} else {
if ( $tokenMatches ) {
// lost rights meanwhile
$out->addWikiMsg( 'abusefilter-edit-notallowed' );
}
if ( $history_id ) {
$out->addWikiMsg(
'abusefilter-edit-oldwarning', $this->mHistoryID, $this->mFilter );
@ -483,7 +488,7 @@ class AbuseFilterViewEdit extends AbuseFilterView {
);
}
if ( $user->isAllowed( 'abusefilter-modify' ) ) {
if ( $this->canEdit() ) {
// Test link
$tools .= Xml::tags(
'p', null,