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

[fe...@apache.org]

Author: felicity
Date: Sat Dec 17 19:57:08 2005
New Revision: 357426

URL: http://svn.apache.org/viewcvs?rev=357426&view=rev
Log:
found a todo to move a variable from SA.pm to Conf.pm

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=357426&r1=357425&r2=357426&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Sat Dec 17 19:57:08 2005
@@ -292,9 +292,6 @@
   # Make sure that we clean $PATH if we're tainted
   Mail::SpamAssassin::Util::clean_path_in_taint_mode();
 
-  # TODO: this should be in Conf!
-  $self->{encapsulated_content_description} = 'original message before SpamAssassin';
-
   if (!defined $self->{username}) {
     $self->{username} = (Mail::SpamAssassin::Util::portable_getpwuid ($>))[0];
   }
@@ -900,7 +897,7 @@
         # Ok, we found the encapsulated piece ...
 	if ($ct =~ m@^(?:message/rfc822|text/plain);\s+x-spam-type=original@ ||
 	    ($ct eq "message/rfc822" &&
-	     $cd eq $self->{'encapsulated_content_description'}))
+	     $cd eq $self->{conf}->{'encapsulated_content_description'}))
         {
           splice @msg, 0, $i+1;  # remove the front part, including the blank line
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=357426&r1=357425&r2=357426&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sat Dec 17 19:57:08 2005
@@ -2806,6 +2806,8 @@
   $self->{bayes_expiry_period} = 43200;
   $self->{bayes_expiry_max_exponent} = 9;
 
+  $self->{encapsulated_content_description} = 'original message before SpamAssassin';
+
   $self;
 }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=357426&r1=357425&r2=357426&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Sat Dec 17 19:57:08 2005
@@ -832,7 +832,7 @@
   my $type = "message/rfc822";
   $type = "text/plain" if $self->{conf}->{report_safe} > 1;
 
-  my $description = $self->{main}->{'encapsulated_content_description'};
+  my $description = $self->{conf}->{'encapsulated_content_description'};
 
   # Note: the message should end in blank line since mbox format wants
   # blank line at end and messages may be concatenated!  In addition, the