Mailing List Archive

Author: felicity
Date: Sun Aug 20 14:19:03 2006
New Revision: 433050

URL: http://svn.apache.org/viewvc?rev=433050&view=rev
Log:
bug 4848: Pyzor, DCC, and SpamCop plugins weren't looking at the right place to see the 'dont_report_to_...' options

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=433050&r1=433049&r2=433050&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Sun Aug 20 14:19:03 2006
@@ -637,7 +637,7 @@
sub plugin_report {
my ($self, $options) = @_;

- return if $self->{options}->{dont_report_to_dcc};
+ return if $options->{report}->{options}->{dont_report_to_dcc};
$self->get_dcc_interface();
return if $self->{dcc_disabled};


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=433050&r1=433049&r2=433050&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Sun Aug 20 14:19:03 2006
@@ -335,7 +335,7 @@
return unless $self->{pyzor_available};
return unless $self->{main}->{conf}->{use_pyzor};

- if (!$self->{options}->{dont_report_to_pyzor} && $self->is_pyzor_available())
+ if (!$options->{report}->{options}->{dont_report_to_pyzor} && $self->is_pyzor_available())
{
# use temporary file: open2() is unreliable due to buffering under spamd
my $tmpf = $options->{report}->create_fulltext_tmpfile($options->{text});

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm?rev=433050&r1=433049&r2=433050&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm Sun Aug 20 14:19:03 2006
@@ -161,7 +161,7 @@

return unless $self->{spamcop_available};

- if (!$self->{options}->{dont_report_to_spamcop}) {
+ if (!$options->{report}->{options}->{dont_report_to_spamcop}) {
if ($self->spamcop_report($options)) {
$options->{report}->{report_available} = 1;
info("reporter: spam reported to SpamCop");