[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove old email blocking hack

2017-10-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385106 )

Change subject: Remove old email blocking hack
..


Remove old email blocking hack

Logs indicate it's not being used.

Bug: T175419
Change-Id: Ic2edda7300fef4ef9f053d83e7d54179166593c0
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 11 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified
  Zoranzoki21: Looks good to me, but someone else must approve



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 100bc29..d60dccb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2032,17 +2032,6 @@
 $wgDefaultUserOptions['usenewrc'] = 0;
 $wgDefaultUserOptions['extendwatchlist'] = 0;
 
-# # Hack to block emails from some user who likes 'The Joker' --Andrew 
2009-05-28
-$wgHooks['EmailUser'][] = function ( &$to, &$from, &$subject, &$text ) {
-   $blockedAddresses = [ 'the4jo...@gmail.com', 
'randomdude5...@gmail.com', 'siyang...@yahoo.com', 'johnnyw...@gmail.com', 
'wikifreedomfigh...@googlemail.com' ];
-   $emailIsBlacklisted = in_array( $from->address, $blockedAddresses );
-   if ( $emailIsBlacklisted ) {
-   wfDebugLog( 'AdHocDebug', "Blocking email from 
{$from->address}" ); // T175419
-   }
-
-   return !$emailIsBlacklisted;
-};
-
 // ContributionTracking for handling PayPal redirects
 if ( $wgUseContributionTracking ) {
wfLoadExtension( 'ContributionTracking' );

-- 
To view, visit https://gerrit.wikimedia.org/r/385106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2edda7300fef4ef9f053d83e7d54179166593c0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove old email blocking hack

2017-10-18 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/385106 )

Change subject: Remove old email blocking hack
..

Remove old email blocking hack

Logs indicate it's not being used.

Bug: T175419
Change-Id: Ic2edda7300fef4ef9f053d83e7d54179166593c0
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/06/385106/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 100bc29..d60dccb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2032,17 +2032,6 @@
 $wgDefaultUserOptions['usenewrc'] = 0;
 $wgDefaultUserOptions['extendwatchlist'] = 0;
 
-# # Hack to block emails from some user who likes 'The Joker' --Andrew 
2009-05-28
-$wgHooks['EmailUser'][] = function ( &$to, &$from, &$subject, &$text ) {
-   $blockedAddresses = [ 'the4jo...@gmail.com', 
'randomdude5...@gmail.com', 'siyang...@yahoo.com', 'johnnyw...@gmail.com', 
'wikifreedomfigh...@googlemail.com' ];
-   $emailIsBlacklisted = in_array( $from->address, $blockedAddresses );
-   if ( $emailIsBlacklisted ) {
-   wfDebugLog( 'AdHocDebug', "Blocking email from 
{$from->address}" ); // T175419
-   }
-
-   return !$emailIsBlacklisted;
-};
-
 // ContributionTracking for handling PayPal redirects
 if ( $wgUseContributionTracking ) {
wfLoadExtension( 'ContributionTracking' );

-- 
To view, visit https://gerrit.wikimedia.org/r/385106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2edda7300fef4ef9f053d83e7d54179166593c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits