svn commit: rev 6200 - in incubator/spamassassin/trunk/lib/Mail/SpamAssassin: . MIME

[fe...@apache.org]

Author: felicity
Date: Sat Jan 17 22:28:02 2004
New Revision: 6200

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME/Parser.pm
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Log:
starting to get rid of the Mail::Audit stuff
mime parser will now accept parse data that's already an array or a
file descriptor.


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm	Sat Jan 17 22:28:02 2004
@@ -82,11 +82,6 @@
   $self;
 }
 
-sub create_new {
-  my ($self, @args) = @_;
-  return Mail::SpamAssassin::NoMailAudit->new(@args);
-}
-
 sub put_header {
   my ($self, $hdr, $text) = @_;
   $self->{mail_object}->put_header ($hdr, $text);

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME/Parser.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME/Parser.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME/Parser.pm	Sat Jan 17 22:28:02 2004
@@ -50,8 +50,18 @@
   # protect it from abuse ...
   local $_;
 
-  # Split the scalar into an array of lines
-  my @message = split ( /^/m, $message );
+  my @message;
+  if (ref $message eq 'ARRAY') {
+     @message = @{$message};
+  }
+  elsif (ref $message eq 'GLOB') {
+    if (defined fileno $message) {
+      @message = <$message>;
+    }
+  }
+  else {
+    @message = split ( /^/m, $message );
+  }
 
   # trim mbox seperator if it exists
   shift @message if ( scalar @message > 0 && $message[0] =~ /^From\s/ );

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm	Sat Jan 17 22:28:02 2004
@@ -88,18 +88,6 @@
 
 ###########################################################################
 
-sub get_mail_object {
-  my ($self) = @_;
-  return $self->{mail_object};
-}
-
-###########################################################################
-
-sub create_new {
-  my ($self, @args) = @_;
-  die "unimplemented base method";
-}
-
 sub get_pristine_header {
   my ($self, $hdr) = @_;
   die "unimplemented base method";

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm	Sat Jan 17 22:28:02 2004
@@ -118,20 +118,6 @@
 
 # ---------------------------------------------------------------------------
 
-sub create_new {
-  my ($self, @args) = @_;
-  return Mail::SpamAssassin::NoMailAudit->new(@args);
-}
-
-# ---------------------------------------------------------------------------
-
-sub get_mail_object {
-  my ($self) = @_;
-  return $self;
-}
-
-# ---------------------------------------------------------------------------
-
 sub parse_headers {
   my ($self) = @_;
   local ($_);
@@ -427,11 +413,6 @@
   exit (0) unless $self->{noexit};
 }
 
-sub print {
-  my ($self, $fh) = @_;
-  print $fh $self->as_string();
-}
-
 # ---------------------------------------------------------------------------
 
 sub accept {
@@ -540,55 +521,6 @@
   my $lockfile = $self->{dotlock_locked};
   if (!defined $lockfile) { die "no dotlock_locked"; }
   unlink $lockfile or warn "unlink $lockfile failed: $!";
-}
-
-# ---------------------------------------------------------------------------
-
-sub reject {
-  my $self = shift;
-  $self->_proxy_to_mail_audit ('reject', @_);
-}
-
-sub resend {
-  my $self = shift;
-  $self->_proxy_to_mail_audit ('resend', @_);
-}
-
-# ---------------------------------------------------------------------------
-
-sub _proxy_to_mail_audit {
-  my $self = shift;
-  my $method = shift;
-  my $ret;
-
-  my @textary = split (/^/m, $self->as_string());
-
-  eval {
-    require Mail::Audit;
-
-    my %opts = ( 'data' => \@textary );
-    if (exists $self->{noexit}) { $opts{noexit} = $self->{noexit}; }
-    if (exists $self->{loglevel}) { $opts{loglevel} = $self->{loglevel}; }
-    if (exists $self->{log}) { $opts{log} = $self->{log}; }
-
-    my $audit = new Mail::Audit (%opts);
-
-    if ($method eq 'accept') {
-      $ret = $audit->accept (@_);
-    } elsif ($method eq 'reject') {
-      $ret = $audit->reject (@_);
-    } elsif ($method eq 'resend') {
-      $ret = $audit->resend (@_);
-    }
-  };
-
-  if ($@) {
-    warn "spamassassin: $method() failed, Mail::Audit ".
-            "module could not be loaded: $@";
-    return undef;
-  }
-
-  return $ret;
 }
 
 # ---------------------------------------------------------------------------

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Sat Jan 17 22:28:02 2004
@@ -610,12 +610,9 @@
   my $newmsg = '';
 
   # remove first line if it is "From "
-  if ($original =~ s/^(From (.*?)\n)//s) {
-    # jm: surely do not add it again? we wind up with a bad header
-    #$newmsg .= $1;
-  }
+  $original =~ s/^From .*\n//;
 
-    # the report charset
+  # the report charset
   my $report_charset = "";
   if ($self->{conf}->{report_charset}) {
     $report_charset = "; charset=" . $self->{conf}->{report_charset};
@@ -758,8 +755,6 @@
   
   my @lines = split (/^/m,  $newmsg);
   $self->{msg}->replace_original_message(\@lines);
-
-  $self->{msg}->get_mail_object;
 }
 
 sub rewrite_headers {
@@ -797,7 +792,6 @@
       }
 
   }
-  $self->{msg}->get_mail_object;
 }
 
 sub _process_header {