svn commit: r1839366 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm PerMsgStatus.pm

[bi...@apache.org]

Author: billcole
Date: Mon Aug 27 19:17:21 2018
New Revision: 1839366

URL: http://svn.apache.org/viewvc?rev=1839366&view=rev
Log:
Adding configurable wrap width for X-Spam-Report header. Bug #6104

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1839366&r1=1839365&r2=1839366&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Mon Aug 27 19:17:21 2018
@@ -1042,6 +1042,19 @@ the original mail into tagged messages.
     }
   });
 
+=item report_wrap_width (default: 75) 
+
+This option sets the wrap width for description lines in the X-Spam-Report 
+header. 
+
+=cut
+
+  push (@cmds, {
+    setting => 'report_wrap_width',
+    default => '75',
+    type => $CONF_TYPE_NUMERIC,
+  });
+
 =back
 
 =head2 LANGUAGE OPTIONS

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1839366&r1=1839365&r2=1839366&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Aug 27 19:17:21 2018
@@ -2635,7 +2635,7 @@ sub _wrap_desc {
   my ($self, $desc, $firstlinelength, $prefix) = @_;
 
   my $firstline = " " x $firstlinelength;
-  my $wrapped = Mail::SpamAssassin::Util::wrap($desc, $prefix, $firstline, 75, 0);
+  my $wrapped = Mail::SpamAssassin::Util::wrap($desc, $prefix, $firstline, $self->{conf}->{report_wrap_width}, 0);
   $wrapped =~ s/^\s+//s;
   $wrapped;
 }