diff options
Diffstat (limited to 'extensions/LimitedEmail')
-rw-r--r-- | extensions/LimitedEmail/Config.pm | 14 | ||||
-rw-r--r-- | extensions/LimitedEmail/Extension.pm | 62 |
2 files changed, 38 insertions, 38 deletions
diff --git a/extensions/LimitedEmail/Config.pm b/extensions/LimitedEmail/Config.pm index 94b9b10eb..d47fb4d91 100644 --- a/extensions/LimitedEmail/Config.pm +++ b/extensions/LimitedEmail/Config.pm @@ -11,15 +11,15 @@ use 5.10.1; use strict; use warnings; -use constant NAME => 'LimitedEmail'; -use constant REQUIRED_MODULES => [ ]; -use constant OPTIONAL_MODULES => [ ]; +use constant NAME => 'LimitedEmail'; +use constant REQUIRED_MODULES => []; +use constant OPTIONAL_MODULES => []; use constant FILTERS => [ - qr/^(?:glob|dkl|justdave|shyam)\@mozilla\.com$/i, - qr/^byron\.jones\@gmail\.com$/i, - qr/^gerv\@mozilla\.org$/i, - qr/^reed\@reedloden\.com$/i, + qr/^(?:glob|dkl|justdave|shyam)\@mozilla\.com$/i, + qr/^byron\.jones\@gmail\.com$/i, + qr/^gerv\@mozilla\.org$/i, + qr/^reed\@reedloden\.com$/i, ]; __PACKAGE__->NAME; diff --git a/extensions/LimitedEmail/Extension.pm b/extensions/LimitedEmail/Extension.pm index 9b504db91..3831ac878 100644 --- a/extensions/LimitedEmail/Extension.pm +++ b/extensions/LimitedEmail/Extension.pm @@ -21,46 +21,46 @@ use Encode qw(encode_utf8); use Bugzilla::Constants qw(bz_locations); sub mailer_before_send { - my ($self, $args) = @_; - my $email = $args->{email}; - my $header = $email->{header}; - return if $header->header('to') eq ''; + my ($self, $args) = @_; + my $email = $args->{email}; + my $header = $email->{header}; + return if $header->header('to') eq ''; - my $blocked = ''; - if (!deliver_to($header->header('to'))) { - $blocked = $header->header('to'); - $header->header_set(to => ''); - } + my $blocked = ''; + if (!deliver_to($header->header('to'))) { + $blocked = $header->header('to'); + $header->header_set(to => ''); + } - my $log_filename = bz_locations->{'datadir'} . '/mail.log'; - my $fh = FileHandle->new(">>$log_filename"); - if ($fh) { - print $fh encode_utf8(sprintf( - "[%s] %s%s %s : %s\n", - time2str('%D %T', time), - ($blocked eq '' ? '' : '(blocked) '), - ($blocked eq '' ? $header->header('to') : $blocked), - $header->header('X-Bugzilla-Reason') || '-', - $header->header('subject') - )); - $fh->close(); - } + my $log_filename = bz_locations->{'datadir'} . '/mail.log'; + my $fh = FileHandle->new(">>$log_filename"); + if ($fh) { + print $fh encode_utf8(sprintf( + "[%s] %s%s %s : %s\n", + time2str('%D %T', time), + ($blocked eq '' ? '' : '(blocked) '), + ($blocked eq '' ? $header->header('to') : $blocked), + $header->header('X-Bugzilla-Reason') || '-', + $header->header('subject') + )); + $fh->close(); + } } sub deliver_to { - my $email = address_of(shift); - my $ra_filters = Bugzilla::Extension::LimitedEmail::FILTERS; - foreach my $re (@$ra_filters) { - if ($email =~ $re) { - return 1; - } + my $email = address_of(shift); + my $ra_filters = Bugzilla::Extension::LimitedEmail::FILTERS; + foreach my $re (@$ra_filters) { + if ($email =~ $re) { + return 1; } - return 0; + } + return 0; } sub address_of { - my $email = shift; - return $email =~ /<([^>]+)>/ ? $1 : $email; + my $email = shift; + return $email =~ /<([^>]+)>/ ? $1 : $email; } __PACKAGE__->NAME; |