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

Merge "Simplify AbuseFilterVariableHolder::dumpAllVars"

Browse source
This commit is contained in:
jenkins-bot 2019-03-17 11:04:53 +00:00 committed by Gerrit Code Review
parent f63b7e8039 7b3526e3b7
commit 8588c35142
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/AbuseFilterVariableHolder.php
View file

@ -140,8 +140,6 @@ class AbuseFilterVariableHolder {
* @return array
*/
public function dumpAllVars( $compute = [], $includeUserVars = false ) {
$allVarNames = array_keys( $this->mVars );
$exported = [];
$coreVariables = [];
if ( !$includeUserVars ) {
@ -149,34 +147,23 @@ class AbuseFilterVariableHolder {
// to filter user set ones by name
global $wgRestrictionTypes;
$coreVariables = AbuseFilter::getBuilderValues();
$coreVariables = array_keys( $coreVariables['vars'] );
$activeVariables = array_keys( AbuseFilter::getBuilderValues()['vars'] );
$deprecatedVariables = array_keys( AbuseFilter::getDeprecatedVariables() );
$coreVariables = array_merge( $coreVariables, $deprecatedVariables );
$coreVariables = array_merge( $activeVariables, $deprecatedVariables );
// Title vars can have several prefixes
$prefixes = [ 'MOVED_FROM', 'MOVED_TO', 'PAGE' ];
$titleVars = [
'_ID',
'_NAMESPACE',
'_TITLE',
'_PREFIXEDTITLE',
'_recent_contributors',
'_age',
];
// @todo _restrictions variables should be handled in builderValues as well.
$prefixes = [ 'moved_from', 'moved_to', 'page' ];
foreach ( $wgRestrictionTypes as $action ) {
$titleVars[] = "_restrictions_$action";
}
foreach ( $titleVars as $var ) {
foreach ( $prefixes as $prefix ) {
$coreVariables[] = $prefix . $var;
$coreVariables[] = "{$prefix}_restrictions_$action";
}
}
$coreVariables = array_map( 'strtolower', $coreVariables );
}
foreach ( $allVarNames as $varName ) {
$exported = [];
foreach ( array_keys( $this->mVars ) as $varName ) {
if (
( $includeUserVars || in_array( strtolower( $varName ), $coreVariables ) ) &&
// Only include variables set in the extension in case $includeUserVars is false