wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-23 10:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Allow IP addresses in user selectors"

Browse source
This commit is contained in:
jenkins-bot 2018-05-24 18:15:33 +00:00 committed by Gerrit Code Review
parent 16d496e436 45b8855754
commit 96a91ac9b2
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/Views/AbuseFilterViewExamine.php
View file

@ -41,6 +41,7 @@ class AbuseFilterViewExamine extends AbuseFilterView {
'SearchUser' => [
'label-message' => 'abusefilter-test-user',
'type' => 'user',
'ipallowed' => true,
'default' => $this->mSearchUser,
],
'SearchPeriodStart' => [

16
includes/special/SpecialAbuseLog.php
View file

@ -115,22 +115,13 @@ class SpecialAbuseLog extends SpecialPage {
public function loadParameters() {
$request = $this->getRequest();
$this->mSearchUser = trim( $request->getText( 'wpSearchUser' ) );
$searchUsername = trim( $request->getText( 'wpSearchUser' ) );
$userTitle = Title::newFromText( $searchUsername, NS_USER );
$this->mSearchUser = $userTitle ? $userTitle->getText() : null;
if ( $this->getConfig()->get( 'AbuseFilterIsCentral' ) ) {
$this->mSearchWiki = $request->getText( 'wpSearchWiki' );
}
$u = User::newFromName( $this->mSearchUser );
if ( $u ) {
// Username normalisation
$this->mSearchUser = $u->getName();
} elseif ( IP::isIPAddress( $this->mSearchUser ) ) {
// It's an IP
$this->mSearchUser = IP::sanitizeIP( $this->mSearchUser );
} else {
$this->mSearchUser = null;
}
$this->mSearchTitle = $request->getText( 'wpSearchTitle' );
$this->mSearchFilter = null;
$this->mSearchActionTaken = $request->getText( 'wpSearchActionTaken' );
@ -163,6 +154,7 @@ class SpecialAbuseLog extends SpecialPage {
'SearchUser' => [
'label-message' => 'abusefilter-log-search-user',
'type' => 'user',
'ipallowed' => true,
'default' => $this->mSearchUser,
],
'SearchTitle' => [