wikimedia/mediawiki-extensions-TitleBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist synced 2024-11-15 10:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Followup r84575, bug 27470

Browse source 
Inverse all the booleans in matches

Previous fix was naieve, and just ended up picking the first regex and dieing with that
This commit is contained in:
Sam Reed 2011-03-22 23:07:21 +00:00
parent 3f4d451d20
commit 939bf7f912
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
TitleBlacklist.list.php
View file

@ -104,7 +104,7 @@ class TitleBlacklist {
return '';
}
/**
* Parse blacklist from a string
*
@ -115,8 +115,7 @@ class TitleBlacklist {
wfProfileIn( __METHOD__ );
$lines = preg_split( "/\r?\n/", $list );
$result = array();
foreach ( $lines as $line )
{
foreach ( $lines as $line ) {
$line = TitleBlacklistEntry :: newFromString( $line );
if ( $line ) {
$result[] = $line;
@ -164,7 +163,7 @@ class TitleBlacklist {
if( $this->isWhitelisted( $title, $action ) ) {
return false;
}
return $item;
return $item; // "returning true"
}
}
return false;
@ -254,8 +253,9 @@ class TitleBlacklist {
foreach( $blacklist as $e ) {
wfSuppressWarnings();
$regex = $e->getRegex();
if( preg_match( "/{$regex}/u", '' ) === false )
if( preg_match( "/{$regex}/u", '' ) === false ) {
$badEntries[] = $e->getRaw();
}
wfRestoreWarnings();
}
return $badEntries;
@ -304,7 +304,8 @@ class TitleBlacklistEntry {
*
* @param $title Title to check
* @param $action %Action to check
* @return TRUE if the user can; otherwise FALSE
* @return TRUE if the the regex matches the title, and is not overridden
* else if it doesn't match (or was overridden)
*/
public function matches( $title, $action ) {
wfSuppressWarnings();
@ -314,24 +315,24 @@ class TitleBlacklistEntry {
global $wgUser;
if( $match ) {
if( isset( $this->mParams['autoconfirmed'] ) && $wgUser->isAllowed( 'autoconfirmed' ) ) {
return true;
return false;
}
if( isset( $this->mParams['moveonly'] ) && $action != 'move' ) {
return true;
return false;
}
if( isset( $this->mParams['newaccountonly'] ) && $action != 'new-account' ) {
return true;
return false;
}
if( !isset( $this->mParams['noedit'] ) && $action == 'edit' ) {
return true;
return false;
}
if ( isset( $this->mParams['reupload'] ) && $action == 'upload' ) {
// Special:Upload also checks 'create' permissions when not reuploading
return true;
return false;
}
return false;
return true;
}
return true;
return false;
}
/**