Changeset 2328 for trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib.pm

Timestamp:

02/03/09 13:05:52 (3 years ago)

Author:

CrawfordCurrie

Message:

Foswikitask:Item456: ported to Foswiki Foswikitask:Item4955: config options moved to 'Mail and Proxies' Foswikitask:Item5829: force new revision on each submission Foswikitask:Item5843: extract target topic from CC: field - general improvement to rules for extracting the target topic

File:

• trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib.pm (modified) (7 diffs)

trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib.pm

@@ -2 +2 @@
 # Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
+# Copyright (C) 2009 Foswiki Contributors. All Rights Reserved.
+# Foswiki Contributors are listed in the AUTHORS file in the root
+# of this distribution. NOTE: Please extend that file, not this notice.
+#
+# Additional copyrights apply to some or all of the code in this module
+# as follows:
 # Copyright (C) 2005 TWiki Contributors. All Rights Reserved.
-# Copyright (C) 2008 Foswiki Contributors. All Rights Reserved.
-# Foswiki Contributors are listed in the AUTHORS file in the root
-# of this distribution.
-# NOTE: Please extend that file, not this notice.
 #
 # This program is free software; you can redistribute it and/or
@@ -23 +25 @@
 use strict;
 use Foswiki;
+use Assert;
 
 use Email::Folder;
@@ -164 +167 @@
             }
         }
-        unless ($received) {
+        if (!$received && $mail->header('Date')) {
             # Use the send date
             $received = Time::ParseDate::parsedate($mail->header('Date'));
@@ -171 +174 @@
 
         # Try to get the target topic by
-        #    1. examining the "To" address to see if it is a valid web.wikiname (if
-        #       enabled in config)
-        #    2. if the subject line starts with a valid Foswiki Web.WikiName (if optionally
-        #       followed by a colon, the rest of the subject line will be ignored)
+        #    1. examining the "To" and "cc" addresses to see if either has
+        #       a valid web.wikiname (if enabled in config)
+        #    2. if the subject line starts with a valid Foswiki Web.WikiName
+        #       (if optionally followed by a colon, the rest of the subject
+        #       line will be ignored)
         #    3. Routing the comment to the spambox if it is enabled
         #    4. Otherwise replying to the user to say "no thanks" if replyonnotopic
@@ -191 +195 @@
             $user = $targets->[0];
         }
-        my $to = $mail->header('To');
-        $to =~ s/^.*<(.*)>.*$/$1/;
+
+        my @to = split(/,\s*/, $mail->header('To') || '');
+        if (defined $mail->header('CC')) {
+            push(@to, split(/,\s*/, $mail->header('CC')));
+        }
+        # Use the address in the <> if there is one
+        @to = map { /^.*<(.*)>.*$/ ? $1 : $_; } @to;
+        print STDERR "Targets: ", join(' ', @to),"\n" if $this->{debug};
+        print STDERR "Subject: $subject\n" if $this->{debug};
 
         unless( $user ) {
@@ -204 +215 @@
         }
 
-        print STDERR "User ",($user||'undefined'),"\n" if( $this->{debug} );
-
-        if( $box->{topicPath} =~ /\bto\b/ &&
-              $to =~ /^(?:($Foswiki::regex{webNameRegex})\.)($Foswiki::regex{wikiWordRegex})@/i) {
-            ( $web, $topic ) = ( $1, $2 );
-        }
+        print STDERR "User is '",($user||'undefined'),"'\n"
+          if( $this->{debug} );
+
+        # See if we can get a valid web.topic out of to: or cc:
+        if( $box->{topicPath} =~ /\bto\b/) {
+            foreach my $target (@to) {
+                next unless $target =~ /^(?:($Foswiki::regex{webNameRegex})\.)($Foswiki::regex{topicNameRegex})\@/i;
+                my ($guessweb, $guesstopic) =
+                  Foswiki::Func::normalizeWebTopicName(
+                      ($1 || $box->{defaultWeb}), $2);
+                if (Foswiki::Func::topicExists($guessweb, $guesstopic)) {
+                    # Found an existing topic
+                    ($web, $topic) = ($guessweb, $guesstopic);
+                    last;
+                }
+            }
+        }
+
+        # If we didn't get the name of an existing topic from the
+        # To: or CC:, use the Subject:
         if( !$topic && $box->{topicPath} =~ /\bsubject\b/ &&
               $subject =~
-                s/^\s*(?:($Foswiki::regex{webNameRegex})\.)?($Foswiki::regex{wikiWordRegex})(:\s*|\s*$)// ) {
-            ( $web, $topic ) = ( $1, $2 );
+                /^\s*(?:($Foswiki::regex{webNameRegex})\.)?($Foswiki::regex{topicNameRegex})(:\s*|\s*$)/ ) {
+            ($web, $topic) = Foswiki::Func::normalizeWebTopicName(
+                ($1 || $box->{defaultWeb}), $2);
+            # This time the topic doesn't have to exist
         }
 
@@ -402 +429 @@
         print STDERR "Save topic $web.$topic:\n$text\n" if( $this->{debug} );
 
+        ASSERT(!$meta || $meta->isa('Foswiki::Meta')) if DEBUG;
         Foswiki::Func::saveTopic(
-            $web, $topic, $text, $meta,
+            $web, $topic, $meta, $text,
             { comment => "Submitted by e-mail",
               forcenewrevision => 1} );