svn commit: r1211678 - /spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

[km...@apache.org]

Author: kmcgrail
Date: Wed Dec  7 22:23:16 2011
New Revision: 1211678

URL: http://svn.apache.org/viewvc?rev=1211678&view=rev
Log:
reverting to previous padding for scores bug 6651 specifically for _SCORE(pad)_ tag

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1211678&r1=1211677&r2=1211678&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Dec  7 22:23:16 2011
@@ -1257,15 +1257,22 @@ sub _get_tag_value_for_yesno {
 }
 
 sub _get_tag_value_for_score {
-  #$pad parameter never used.  removed.
-  my ($self) = @_;
+  my ($self, $pad) = @_;
 
   my $score  = sprintf("%2.1f", $self->{score});
   my $rscore = $self->_get_tag_value_for_required_score();
 
   #Change due to bug 6419 to use Util function for consistency with spamd
   #and PerMessageStatus
-  return Mail::SpamAssassin::Util::get_tag_value_for_score($score, $rscore, $self->{is_spam});
+  $score = Mail::SpamAssassin::Util::get_tag_value_for_score($score, $rscore, $self->{is_spam});
+
+  #$pad IS PROVIDED BY THE _SCORE(PAD)_ tag
+  if (defined $pad && $pad =~ /^(0+| +)$/) {
+    my $count = length($1) + 3 - length($score);
+    $score = (substr($pad, 0, $count) . $score) if $count > 0;
+  }
+  return $score;
+
 }
 
 sub _get_tag_value_for_required_score {