wikimedia/mediawiki-extensions-SpamBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamBlacklist synced 2024-11-23 22:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(bug 45461) Use email instead of e-mail

Browse source 
Change-Id: Ibad4c4c7c98f5b0c746d62f1b2b41a4a99360ee8
This commit is contained in:
Siebrand Mazeland 2013-02-27 12:50:47 +01:00
parent 4b6387ab03
commit 2e6259f35f
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
EmailBlacklist.php
View file

@ -15,7 +15,7 @@ class EmailBlacklist extends BaseBlacklist {
}
/**
* Checks a User object for a blacklisted e-mail address
* Checks a User object for a blacklisted email address
*
* @param User $user
* @return bool True on valid email
@ -32,9 +32,9 @@ class EmailBlacklist extends BaseBlacklist {
return true;
}
// Check for whitelisted e-mail addresses
// Check for whitelisted email addresses
if ( is_array( $whitelists ) ) {
wfDebugLog( 'SpamBlacklist', "Excluding whitelisted e-mail addresses from " . count( $whitelists ) .
wfDebugLog( 'SpamBlacklist', "Excluding whitelisted email addresses from " . count( $whitelists ) .
" regexes: " . implode( ', ', $whitelists ) . "\n" );
foreach ( $whitelists as $regex ) {
if ( preg_match( $regex, $email ) ) {

12
SpamBlacklist.i18n.php
View file

@ -29,13 +29,13 @@ $messages['en'] = array(
#</pre> <!-- leave this line exactly as it is -->',
'email-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
# E-mail addresses matching this list will be blocked from registering or sending e-mails
# Email addresses matching this list will be blocked from registering or sending emails
# This list affects only this wiki; refer also to the global blacklist.
# For documentation see https://www.mediawiki.org/wiki/Extension:SpamBlacklist
#
# Syntax is as follows:
# * Everything from a "#" character to the end of the line is a comment
# * Every non-blank line is a regex fragment which will only match hosts inside e-mail addresses
# * Every non-blank line is a regex fragment which will only match hosts inside email addresses
#</pre> <!-- leave this line exactly as it is -->',
'email-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
@ -44,13 +44,13 @@ $messages['en'] = array(
#
# Syntax is as follows:
# * Everything from a "#" character to the end of the line is a comment
# * Every non-blank line is a regex fragment which will only match hosts inside e-mail addresses
# * Every non-blank line is a regex fragment which will only match hosts inside email addresses
#</pre> <!-- leave this line exactly as it is -->',
'spam-blacklisted-email' => 'Blacklisted e-mail address',
'spam-blacklisted-email-text' => 'Your e-mail address is currently blacklisted from sending e-mails to other users.',
'spam-blacklisted-email-signup' => 'The given e-mail address is currently blacklisted from use.',
'spam-blacklisted-email' => 'Blacklisted email address',
'spam-blacklisted-email-text' => 'Your email address is currently blacklisted from sending emails to other users.',
'spam-blacklisted-email-signup' => 'The given email address is currently blacklisted from use.',
'spam-invalid-lines' => "The following spam blacklist {{PLURAL:$1|line is an|lines are}} invalid regular {{PLURAL:$1|expression|expressions}} and {{PLURAL:$1|needs|need}} to be corrected before saving the page:",
'spam-blacklist-desc' => 'Regex-based anti-spam tool: [[MediaWiki:Spam-blacklist]] and [[MediaWiki:Spam-whitelist]]',

2
SpamBlacklistHooks.php
View file

@ -70,7 +70,7 @@ class SpamBlacklistHooks {
}
/**
* Processes new accounts for valid e-mail addresses
* Processes new accounts for valid email addresses
*
* @param $user User
* @param $abortError