svn commit: r157048 - in spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Plugin/SpamCop.pm

[do...@apache.org]

Author: dos
Date: Thu Mar 10 21:07:06 2005
New Revision: 157048

URL: http://svn.apache.org/viewcvs?view=rev&rev=157048
Log:
bug 4064: implements spamcop_max_report_size

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&r1=157047&r2=157048
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Mar 10 21:07:06 2005
@@ -993,6 +993,20 @@
 
 =over 4
 
+=item spamcop_max_report_size		(default: 50)
+
+The size (in kilobytes) at which SpamAssassin will truncate messages
+reported to SpamCop.  The default is the maximum size SpamCop will
+accept at the time of release.
+
+=cut
+
+  push (@cmds, {
+    setting => 'spamcop_max_report_size',
+    default => 50,
+    type => $CONF_TYPE_NUMERIC
+  });
+
 =item trusted_networks ip.add.re.ss[/mask] ...   (default: none)
 
 What networks or hosts are 'trusted' in your setup.  B<Trusted> in this case

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm?view=diff&r1=157047&r2=157048
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm Thu Mar 10 21:07:06 2005
@@ -203,8 +203,8 @@
 	      );
 
   # truncate message
-  if (length($original) > 64*1024) {
-    substr($original,(64*1024)) = "\n[truncated by SpamAssassin]\n";
+  if (length($original) > $self->{conf}->{spamcop_max_report_size}*1024) {
+    substr($original,($self->{conf}->{spamcop_max_report_size}*1024)) = "\n[truncated by SpamAssassin]\n";
   }
 
   my $body = <<"EOM";