wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-13 17:27:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove AbuseFilter::saveFilter dependency on AbuseFilterViewEdit

Browse source 
This dependency is wrong, and removing it will also allow creating an
edit API.

Bug: T213037
Depends-On: Id8412e2b8a4e873fd4821ecc1a3c95710be9a870
Change-Id: If8e745a3227cea5093ea3fd8f5b201adedaba3ae
This commit is contained in:
Daimona Eaytoy 2019-08-27 16:07:52 +02:00
parent 8e166f10d6
commit 540edc5174
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/AbuseFilter.php
View file

@ -1217,7 +1217,7 @@ class AbuseFilter {
/**
* Checks whether user input for the filter editing form is valid and if so saves the filter
*
* @param AbuseFilterViewEdit $page
* @param ContextSource $context
* @param int|string $filter
* @param stdClass $newRow
* @param array $actions
@ -1225,15 +1225,15 @@ class AbuseFilter {
* @return Status
*/
public static function saveFilter(
AbuseFilterViewEdit $page,
ContextSource $context,
$filter,
$newRow,
$actions,
IDatabase $dbw
) {
$validationStatus = Status::newGood();
$request = $page->getRequest();
$user = $page->getUser();
$request = $context->getRequest();
$user = $context->getUser();
// Check the syntax
$syntaxerr = self::checkSyntax( $request->getVal( 'wpFilterRules' ) );
@ -1245,13 +1245,13 @@ class AbuseFilter {
$missing = [];
if ( !$request->getVal( 'wpFilterRules' ) ||
trim( $request->getVal( 'wpFilterRules' ) ) === '' ) {
$missing[] = $page->msg( 'abusefilter-edit-field-conditions' )->escaped();
$missing[] = $context->msg( 'abusefilter-edit-field-conditions' )->escaped();
}
if ( !$request->getVal( 'wpFilterDescription' ) ) {
$missing[] = $page->msg( 'abusefilter-edit-field-description' )->escaped();
$missing[] = $context->msg( 'abusefilter-edit-field-description' )->escaped();
}
if ( count( $missing ) !== 0 ) {
$missing = $page->getLanguage()->commaList( $missing );
$missing = $context->getLanguage()->commaList( $missing );
$validationStatus->error( 'abusefilter-edit-missingfields', $missing );
return $validationStatus;
}
@ -1298,7 +1298,9 @@ class AbuseFilter {
}
}
$availableActions = array_keys( array_filter( $page->getConfig()->get( 'AbuseFilterActions' ) ) );
$availableActions = array_keys(
array_filter( $context->getConfig()->get( 'AbuseFilterActions' ) )
);
$differences = self::compareVersions(
[ $newRow, $actions ],
[ $newRow->mOriginalRow, $newRow->mOriginalActions ],
@ -1337,7 +1339,7 @@ class AbuseFilter {
}
// Check for restricted actions
$restrictions = $page->getConfig()->get( 'AbuseFilterRestrictions' );
$restrictions = $context->getConfig()->get( 'AbuseFilterRestrictions' );
if ( count( array_intersect_key(
array_filter( $restrictions ),
array_merge( $actions, $origActions )
@ -1350,7 +1352,7 @@ class AbuseFilter {
// Everything went fine, so let's save the filter
list( $new_id, $history_id ) =
self::doSaveFilter( $newRow, $differences, $filter, $actions, $wasGlobal, $page, $dbw );
self::doSaveFilter( $newRow, $differences, $filter, $actions, $wasGlobal, $context, $dbw );
$validationStatus->setResult( true, [ $new_id, $history_id ] );
return $validationStatus;
}
@ -1363,7 +1365,7 @@ class AbuseFilter {
* @param int|string $filter
* @param array $actions
* @param bool $wasGlobal
* @param AbuseFilterViewEdit $page
* @param ContextSource $context
* @param IDatabase $dbw DB_MASTER where the filter will be saved
* @return int[] first element is new ID, second is history ID
*/
@ -1373,10 +1375,10 @@ class AbuseFilter {
$filter,
$actions,
$wasGlobal,
AbuseFilterViewEdit $page,
ContextSource $context,
IDatabase $dbw
) {
$user = $page->getUser();
$user = $context->getUser();
// Convert from object to array
$newRow = get_object_vars( $newRow );
@ -1414,7 +1416,7 @@ class AbuseFilter {
$new_id = $dbw->insertId();
}
$availableActions = $page->getConfig()->get( 'AbuseFilterActions' );
$availableActions = $context->getConfig()->get( 'AbuseFilterActions' );
$actionsRows = [];
foreach ( array_filter( $availableActions ) as $action => $_ ) {
// Check if it's set
@ -1496,7 +1498,7 @@ class AbuseFilter {
$subtype = $filter === 'new' ? 'create' : 'modify';
$logEntry = new ManualLogEntry( 'abusefilter', $subtype );
$logEntry->setPerformer( $user );
$logEntry->setTarget( $page->getTitle( $new_id ) );
$logEntry->setTarget( SpecialPage::getTitleFor( SpecialAbuseFilter::PAGE_NAME, $new_id ) );
$logEntry->setParameters( [
'historyId' => $history_id,
'newId' => $new_id

3
includes/special/SpecialAbuseFilter.php
View file

@ -1,6 +1,7 @@
<?php
class SpecialAbuseFilter extends AbuseFilterSpecialPage {
const PAGE_NAME = 'AbuseFilter';
/**
* @var int|string|null The current filter
*/
@ -14,7 +15,7 @@ class SpecialAbuseFilter extends AbuseFilterSpecialPage {
* @inheritDoc
*/
public function __construct() {
parent::__construct( 'AbuseFilter', 'abusefilter-view' );
parent::__construct( self::PAGE_NAME, 'abusefilter-view' );
}
/**