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 "Make AbuseLog searchable by IPv6 IPs"

Browse source
This commit is contained in:
CSteipp 2013-03-26 22:32:23 +00:00 committed by Gerrit Code Review
parent f28ec35691 233a850a08
commit 38bd0a31b5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
special/SpecialAbuseLog.php
View file

@ -70,14 +70,17 @@ class SpecialAbuseLog extends SpecialPage {
$request = $this->getRequest();
$this->mSearchUser = $request->getText( 'wpSearchUser' );
$this->mSearchUser = trim( $request->getText( 'wpSearchUser' ) );
if ( $wgAbuseFilterIsCentral ) {
$this->mSearchWiki = $request->getText( 'wpSearchWiki' );
}
$t = Title::newFromText( trim( $this->mSearchUser ) );
if ( $t ) {
$this->mSearchUser = $t->getText(); // Username normalisation
$u = User::newFromName( $this->mSearchUser );
if ( $u ) {
$this->mSearchUser = $u->getName(); // Username normalisation
} elseif( IP::isIPAddress( $this->mSearchUser ) ) {
// It's an IP
$this->mSearchUser = IP::sanitizeIP( $this->mSearchUser );
} else {
$this->mSearchUser = null;
}
@ -207,7 +210,6 @@ class SpecialAbuseLog extends SpecialPage {
$user = User::newFromName( $this->mSearchUser );
if ( !$user ) {
$conds[] = 'afl_ip=afl_user_text';
$conds['afl_user'] = 0;
$conds['afl_user_text'] = $this->mSearchUser;
} else {