Changeset 1323

Timestamp:

12/13/08 16:58:36 (3 years ago)

Author:

CrawfordCurrie

Message:

Item456: work in progress

Location:

trunk/MailInContrib

Files:

• data/System (moved) (moved from trunk/MailInContrib/data/TWiki)
• data/System/MailInContrib.txt (modified) (9 diffs)
• lib/Foswiki (moved) (moved from trunk/MailInContrib/lib/TWiki)
• lib/Foswiki/Contrib/MailInContrib.pm (modified) (27 diffs)
• lib/Foswiki/Contrib/MailInContrib/Config.spec (modified) (1 diff)
• lib/Foswiki/Contrib/MailInContrib/DEPENDENCIES (modified) (1 diff)
• lib/Foswiki/Contrib/MailInContrib/MANIFEST (modified) (1 diff)
• lib/Foswiki/Contrib/MailInContrib/build.pl (modified) (2 diffs)
• pub/System (moved) (moved from trunk/MailInContrib/pub/TWiki)
• test/unit/MailInContrib/MailInContribSuite.pm (modified) (12 diffs)
• tools/mailincron (modified) (3 diffs)

trunk/MailInContrib/data/System/MailInContrib.txt

@@ -1 @@
----+!! <nop>MailInContrib for TWiki
+---+!! <nop>Mail In to Foswiki
 %SHORTDESCRIPTION%
 <a href="http://wikiring.com"><img src="%ATTACHURL%/logo.gif" style="float:right" /></a>
-This Contrib supports the submission of content to TWiki topics via e-mail.
+This Contrib supports the submission of content to Foswiki topics via e-mail.
 
 <!--
@@ -11 +11 @@
    you make will simply be overwritten the next time a release is generated.
 
-   Instead, you could check your fix in, raise a bug in the Bugs web, or mail the author.
+   Instead, you could check your fix in, raise a bug in the Tasks web, or mail the author.
 -->
 
-<div class="twikiBroadcastMessage" style="background-color:#ffc;">WARNING: TWiki-4 only. If you want to use this extension with an earlier version of TWiki, please use [[http://twiki.org/cgi-bin/attach/Plugins/%TOPIC%?filename=%TOPIC%.zip&revInfo=1][revision 7 of the zip]].</div>
+Mails can be pulled out of mail folders using [[CPAN:Email::Folder::POP3][POP3]], [[CPAN:Email::Folder::IMAP][IMAP]], or anything else supported by CPAN:Email::Folder.
 
-Mails for twiki can be pulled out of mail folders using [[CPAN:Email::Folder::POP3][POP3]], [[CPAN:Email::Folder::IMAP][IMAP]], or anything else supported by CPAN:Email::Folder.
-
-The implementation is very simple; a script called =mailincron= is run every so often (usually by =cron= or an equivalent offline job scheduler). The script trawls the mail folders you specify and grabs messages that it recognises as being for the TWiki.
+The implementation is very simple; a script called =mailincron= is run every so often (usually by =cron= or an equivalent offline job scheduler). The script trawls the mail folders you specify and grabs messages that it recognises as being for the wiki.
 
 For example, your wayward child might send a mail like this from an internet cafe in Thailand:
@@ -28 +26 @@
 *Phuket*: I've run out of money!
 </verbatim>
-The message lands in your email folder at your ISP. Once an hour, a cron job runs the =mailincron= script, which scans the folder. If it finds any messages that have nothing but a correctly formatted TWiki Web.Topic<nop>Name in the subject line, that topic is appended to (created) with the plain text of the email.  The Web must exist, though the topic will be created if necessary. Both web and topic _must_ be specified.
+The message lands in your email folder at your ISP. Once an hour, a cron job runs the =mailincron= script, which scans the folder. If it finds any messages that have nothing but a correctly formatted Web.Topic<nop>Name in the subject line, that topic is appended to (created) with the plain text of the email.  The Web must exist, though the topic will be created if necessary. Both web and topic _must_ be specified.
 
 In our example, the web exists, and so does the topic, so the following text gets appended to Travels.Daily<nop>Diary:
@@ -38 +36 @@
 
 </div>
-Attachments to the mail get treated as attachments by TWiki, and attached to the target topic.
+Attachments to the mail get treated as attachments by Foswiki, and attached to the target topic.
 
 Note that =mailincron= will only process messages that have arrived since the last time it ran. So if there was an error adding a mail, it won't attempt to add it again even if it is still in the inbox.
@@ -51 +49 @@
 The module can use special HTML comments in the topic to decide where to insert new emails within the text.
 
-If it sees the comment =&lt;!--MAIL--&gt;= it will insert the incoming mail immediately *below* the comment. =MAIL= is rather ike a TWikiVariable; you can give it parameters. For example, =&lt;!--MAIL{where="below"}--&gt;=. The following options are available:
+If it sees the comment =&lt;!--MAIL--&gt;= it will insert the incoming mail immediately *below* the comment. =MAIL= is rather ike a [[%SYSTEMWEB%.Macro][Foswiki macro]]; you can give it parameters. For example, =&lt;!--MAIL{where="below"}--&gt;=. The following options are available:
    * =where= - can be =above=, =below= (relative to the comment) =top=, =bottom= (of the topic)
    * =template= set to the name of one of the templates in %SYSTEMWEB%.MailInContribTemplate to change the formatting of comments. The default format is "below" format.
@@ -57 +55 @@
 If there is no such comment in the topic, then it just appends it to the end. If there is more than one, only the first is recognised.
 
-Any attachments in the mail get added to the target topic as TWiki attachments. Attachments are also listed immediately below the mail body in the topic.
+Any attachments in the mail get added to the target topic as attachments. Attachments are also listed immediately below the mail body in the topic.
 
 ---+ How the contributor is identified
-The user identity is used for access control checks on the target topic, so you can use TWiki access controls to protect target topics.
+The user identity is used for access control checks on the target topic, so you can use Foswiki access controls to protect target topics.
 
 You can configure the module to look at the =From:= entry in the email, and if a registered user has set that email (see ChangeEmailAddress), then they are identified as the contributor. Note that there is a security risk here, as the =From:= address in e-mail can easily be spoofed.
@@ -67 +65 @@
 
 <!--
-      * Set SHORTDESCRIPTION = Supports submissions to TWiki via e-mail
+      * Set SHORTDESCRIPTION = Supports submissions to Foswiki via e-mail
 -->
 
@@ -74 +72 @@
 
 __Note__: The CPAN =Email= modules uses *many* pluggable modules to support different folder types. It's impossible to cover all the options here; all we can suggest is that you try running the script from the command-line and resolve missing modules as you find them.
-   * Set up cron (or equivalent) jobs to run =mailincron=. You must =cd= to the TWiki bin directory, and invoke the sript from there (this is so =mailincron= can read =setlib.cfg=)
+   * Set up cron (or equivalent) jobs to run =mailincron=. You must =cd= to the =bin= directory, and invoke the sript from there (this is so =mailincron= can read =setlib.cfg=)
 
 Because of the security issues involved (passwords for the mailboxes etc.) configuration uses variables set in your =LocalSite.cfg=. The easiest way to set them is using =configure=.
 
-The =mailincron= script takes one optional parameter, <tt>debug</tt>, which takes a boolean value e.g. <tt>debug=1</tt>. If you pass anything other than 0 or the empty string in =debug=, the script will scan the mail folders, describe what it would have done, and exit, without modifying any folders, the TWiki, or sending any mails.
+The =mailincron= script takes one optional parameter, <tt>debug</tt>, which takes a boolean value e.g. <tt>debug=1</tt>. If you pass anything other than 0 or the empty string in =debug=, the script will scan the mail folders, describe what it would have done, and exit, without modifying any folders, the wiki, or sending any mails.
 
-To run the script you need to set up a cron job. For example, to transfer mail into the TWiki once every hour you might write:
+To run the script you need to set up a cron job. For example, to transfer mail into the wiki once every hour you might write:
 <verbatim>
-0 * * * * cd /home/twiki/bin && ../tools/mailincron 2&>1 >> /home/twiki/logs/mailincron.log
+0 * * * * cd /home/twiki/bin && ../tools/mailincron 2>&1 >> /home/twiki/logs/mailincron.log
 </verbatim>
 You _must_ run the script from the bin directory.
-Make sure that the cron is run by a user with the permissions needed to read and write the TWiki data directory.
-
-This is a brand-new development, not related in any to the original Foswiki:Extensions/MailInAddon. Due acknowledgement is made to those early pioneers for the idea. ;-)
+Make sure that the cron is run by a user with the permissions needed to read and write the =data= directory.
 
 ---++ Contrib Info
 
-Another great TWiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!
+Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!
 
 Many thanks to the following sponsors for supporting this work:
    * [[http://www.evolvedmedianetwork.com][Evolved Media Network]]
 
-|  Author: | TWiki:Main/CrawfordCurrie (http://c-dot.co.uk) |
-|  Copyright &copy;: | 2005, TWiki Contributors |
+|  Author: | Foswiki:Main.CrawfordCurrie (http://c-dot.co.uk) |
+|  Copyright &copy;: | 2005, TWiki Contributors; 2008 Foswiki Contributors |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
 |  Dependencies: | %$DEPENDENCIES% |
@@ -119 +115 @@
 |  10 Mar 2005 | 1.000 Initial version |
 |  Home: | Foswiki:Extensions/%TOPIC% |
-|  Feedback: | Foswiki:Extensions/%TOPIC%Dev |
-|  Appraisal: | http://foswiki.org/Extensions/%TOPIC%Appraisal |
 
 __Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences

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

@@ -3 +3 @@
 #
 # Copyright (C) 2005 TWiki Contributors. All Rights Reserved.
-# TWiki Contributors are listed in the AUTHORS file in the root
+# 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.
@@ -18 +19 @@
 #
 # As per the GPL, removal of this notice is prohibited.
-package TWiki::Contrib::MailInContrib;
+package Foswiki::Contrib::MailInContrib;
 
 use strict;
-use TWiki;
+use Foswiki;
 
 use Email::Folder;
@@ -32 +33 @@
 use Carp;
 
-# This should always be $Rev: 10183$ so that TWiki can determine the checked-in
+# This should always be $Rev: 10183$ so that Foswiki can determine the checked-in
 # status of the plugin. It is used by the build automation tools, so
 # you should leave it alone.
@@ -62 +63 @@
 
 ---++ ClassMethod new( $session )
-   * =$session= - ref to a TWiki object
+   * =$session= - ref to a Foswiki object
 Construct a new inbox processor.
 
@@ -74 +75 @@
 
     # Find out when we last processed mail
-    my $workdir = TWiki::Func::getWorkArea('MailInContrib');
+    my $workdir = Foswiki::Func::getWorkArea('MailInContrib');
     if (-e "$workdir/timestamp") {
         open(F, "<$workdir/timestamp") || die $!;
@@ -100 +101 @@
 
     # re-stamp
-    my $workdir = TWiki::Func::getWorkArea('MailInContrib');
+    my $workdir = Foswiki::Func::getWorkArea('MailInContrib');
     open(F, ">$workdir/timestamp") || die $!;
     print F time(),"\n";
@@ -109 +110 @@
     my $u = shift;
 
-    if ($TWiki::Plugins::SESSION->{users}->can('getCanonicalUserID')) {
-        return $TWiki::Plugins::SESSION->{users}->getCanonicalUserID($u);
+    if ($Foswiki::Plugins::SESSION->{users}->can('getCanonicalUserID')) {
+        return $Foswiki::Plugins::SESSION->{users}->getCanonicalUserID($u);
     } else {
-        return $TWiki::Plugins::SESSION->{users}->findUser( $u );
+        return $Foswiki::Plugins::SESSION->{users}->findUser( $u );
     }
 }
@@ -121 +122 @@
    * =$box= - hash describing the box
 Scan messages in the box that have been received since the last run,
-and process them for inclusion in TWiki topics.
+and process them for inclusion in Foswiki topics.
 
 =cut
@@ -128 +129 @@
     my( $this, $box ) = @_;
 
-    $TWiki::Plugins::SESSION = $this->{session};
+    $Foswiki::Plugins::SESSION = $this->{session};
 
     die "No folder specification" unless $box->{folder};
@@ -148 +149 @@
 
     # Load the file of mail templates
-    my $templates = TWiki::Func::loadTemplate( 'MailInContrib' );
+    my $templates = Foswiki::Func::loadTemplate( 'MailInContrib' );
 
     print STDERR "Scanning $box->{folder}\n" if $this->{debug};
@@ -172 +173 @@
         #    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 TWiki Web.WikiName (if optionally
+        #    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
@@ -206 +207 @@
 
         if( $box->{topicPath} =~ /\bto\b/ &&
-              $to =~ /^(?:($TWiki::regex{webNameRegex})\.)($TWiki::regex{wikiWordRegex})@/i) {
+              $to =~ /^(?:($Foswiki::regex{webNameRegex})\.)($Foswiki::regex{wikiWordRegex})@/i) {
             ( $web, $topic ) = ( $1, $2 );
         }
         if( !$topic && $box->{topicPath} =~ /\bsubject\b/ &&
               $subject =~
-                s/^\s*(?:($TWiki::regex{webNameRegex})\.)?($TWiki::regex{wikiWordRegex})(:\s*|\s*$)// ) {
+                s/^\s*(?:($Foswiki::regex{webNameRegex})\.)?($Foswiki::regex{wikiWordRegex})(:\s*|\s*$)// ) {
             ( $web, $topic ) = ( $1, $2 );
         }
@@ -219 +220 @@
         print STDERR "Topic $web.",$topic||'',"\n" if $this->{debug};
 
-        unless( TWiki::Func::webExists( $web )) {
+        unless( Foswiki::Func::webExists( $web )) {
             $topic = '';
         }
@@ -243 +244 @@
         if( $received > $this->{lastMailIn} ) {
             my $err = '';
-            unless( $this->{session}->{store}->webExists( $web )) {
+            unless( Foswiki::Func::webExists( $web )) {
                 $err = "Web $web does not exist";
             } else {
@@ -261 +262 @@
                 $this->_onError(
                     $box, $mail,
-                    "TWiki encountered an error while adding your mail to $web.$topic: $err", \%kill, $num );
+                    "Foswiki encountered an error while adding your mail to $web.$topic: $err", \%kill, $num );
             } else {
                 if( $box->{onSuccess} =~ /\breply\b/ ) {
@@ -279 +280 @@
     eval 'use Email::Delete';
     if( $@ ) {
-        TWiki::writeWarning( "Cannot delete from inbox: $@\n" );
+        Foswiki::writeWarning( "Cannot delete from inbox: $@\n" );
     } else {
         Email::Delete::delete_message
@@ -304 +305 @@
 
     if( $box->{onError} =~ /\blog\b/ ) {
-        TWiki::Func::writeWarning( $mess );
+        Foswiki::Func::writeWarning( $mess );
     }
     if( $box->{onError} =~ /\breply\b/ ) {
         $this->_reply( $box, $mail,
-                       "TWiki found an error in your e-mail submission\n\n$mess\n\n".
+                       "Foswiki found an error in your e-mail submission\n\n$mess\n\n".
                          $mail->as_string());
     }
@@ -341 +342 @@
     my $err = '';
 
+    my $curUser = $Foswiki::Plugins::SESSION->{user};
+    $Foswiki::Plugins::SESSION->{user} = $user;
+
     try {
-        my( $meta, $text ) = $this->{session}->{store}->readTopic(
-            $user, $web, $topic );
+        my( $meta, $text ) = Foswiki::Func::readTopic( $web, $topic );
 
         my $opts;
         if( $text =~ /<!--MAIL(?:{(.*?)})?-->/ ) {
-            $opts = new TWiki::Attrs( $1 );
+            $opts = new Foswiki::Attrs( $1 );
         } else {
-            $opts = new TWiki::Attrs( '' );
+            $opts = new Foswiki::Attrs( '' );
         }
         $opts->{template} ||= 'normal';
@@ -358 +361 @@
         # MailInContribTemplate as MailInContribUserTemplate and edit to
         # taste. - VickiBrown - 07 Sep 2007
-        my $insert = TWiki::Func::expandTemplate( 'MAILIN:'.$opts->{template} );
+        my $insert = Foswiki::Func::expandTemplate( 'MAILIN:'.$opts->{template} );
         $insert ||= "   * *%SUBJECT%*: %TEXT% _%WIKIUSERNAME% @ %SERVERTIME%_\n";
         $insert =~ s/%SUBJECT%/$subject/g;
@@ -367 +370 @@
         foreach my $att ( @$attachments ) {
             $attached = 1;
-            $err .= $this->_saveAttachment( $user, $web, $topic, $att );
-            my $tmpl = TWiki::Func::expandTemplate(
+            $err .= $this->_saveAttachment( $web, $topic, $att );
+            my $tmpl = Foswiki::Func::expandTemplate(
                 'MAILIN:'.$opts->{template}.':ATTACHMENT' );
             if( $tmpl ) {
@@ -380 +383 @@
 
         $insert =~ s/%TEXT%/$body/g;
-        my $curUser = $TWiki::Plugins::SESSION->{user};
-        $TWiki::Plugins::SESSION->{user} = $user;
-        $insert = TWiki::Func::expandVariablesOnTopicCreation($insert);
-        $TWiki::Plugins::SESSION->{user} = $curUser;
+        $insert = Foswiki::Func::expandVariablesOnTopicCreation($insert);
 
         # Reload the topic if we added attachments.
         if( $attached ) {
-            ( $meta, $text ) = $this->{session}->{store}->readTopic(
-                $user, $web, $topic );
+            ( $meta, $text ) = Foswiki::Func::readTopic( $web, $topic );
         }
 
@@ -403 +402 @@
         print STDERR "Save topic $web.$topic:\n$text\n" if( $this->{debug} );
 
-        $this->{session}->{store}->saveTopic(
-            $user, $web, $topic, $text, $meta,
-            { comment => "Submitted by e-mail" } );
-
-    } catch TWiki::AccessControlException with {
+        Foswiki::Func::saveTopic(
+            $web, $topic, $text, $meta,
+            { comment => "Submitted by e-mail",
+              forcenewrevision => 1} );
+
+    } catch Foswiki::AccessControlException with {
         my $e = shift;
         $err .= $e->stringify();
@@ -413 +413 @@
         my $e = shift;
         $err .= $e->stringify();
+    } finally {
+        $Foswiki::Plugins::SESSION->{user} = $curUser;
     };
     return $err;
@@ -418 +420 @@
 
 sub _saveAttachment {
-    my( $this, $user, $web, $topic, $attachment ) = @_;
+    my( $this, $web, $topic, $attachment ) = @_;
     my $filename = $attachment->{filename};
     my $payload = $attachment->{payload};
@@ -425 +427 @@
 
     my $tmpfile = $web.'_'.$topic.'_'.$filename;
-    $tmpfile = $TWiki::cfg{PubDir}.'/'.$tmpfile;
+    $tmpfile = $Foswiki::cfg{PubDir}.'/'.$tmpfile;
 
     $tmpfile .= 'X' while -e $tmpfile;
@@ -434 +436 @@
     my $err = '';
     # SMELL: no central way to process attachment filenames, so we
-    # have to copy-paste the TWiki core code.
+    # have to copy-paste the Foswiki core code.
     $filename =~ s/ /_/go;
-    $filename =~ s/$TWiki::cfg{NameFilter}//goi;
-    $filename =~ s/$TWiki::cfg{UploadFilter}/$1\.txt/goi;
-    $this->{session}->{store}->saveAttachment(
-        $web, $topic, $filename, $user,
+    $filename =~ s/$Foswiki::cfg{NameFilter}//goi;
+    $filename =~ s/$Foswiki::cfg{UploadFilter}/$1\.txt/goi;
+    Foswiki::Func::saveAttachment(
+        $web, $topic, $filename,
         { comment => "Submitted by e-mail", file => $tmpfile });
     unlink( $tmpfile );
@@ -455 +457 @@
       "To: $addressee" .
         "\nFrom: ".$mail->header('To').
-          "\nSubject: RE: your TWiki submission to ".$mail->header('Subject').
+          "\nSubject: RE: your Foswiki submission to ".$mail->header('Subject').
             "\n\n$body\n";
-    eval {
-        $TWiki::Plugins::SESSION->{net}->sendEmail( $message, 5 );
-    };
-    if ($@) {
-        print "Failed trying to send mail: $@\n";
+    my $errors = Foswiki::Func::sendEmail( $message, 5 );
+    if ($errors) {
+        print "Failed trying to send mail: $errors\n";
     }
 }

trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib/Config.spec

@@ -1 @@
-# ---+ MailInContrib
+#---+ Mail and Proxies
+#---++ Mail In
 # **PERL**
 # The configuration is in the form of an (perl) array of mailbox

trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib/DEPENDENCIES

@@ -1 @@
-TWiki::Plugins,>=1.1,,This module requires TWiki-4
 Time::ParseDate,>=2003.0211,cpan,Required. Available from the CPAN:Time::ParseDate archive.
-Error,>=0.15,cpan,Required. Available from the CPAN:Error archive.
 Email::Folder,>=0.84,cpan,Required. Available from the CPAN:Email::Folder archive.
 Email::FolderType::Net,>=1.02,cpan,Required. Available from the CPAN:Email::FolderType::Net archive.

trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib/MANIFEST

@@ -1 +1 @@
 tools/mailincron 0555 command-line perl script
-data/TWiki/MailInContrib.txt 0444 this topic
-data/TWiki/MailInContribTemplate.txt 0444 file of templates
-lib/TWiki/Contrib/MailInContrib.pm 0444 perl module
-lib/TWiki/Contrib/MailInContrib/Config.spec 0444 configure spec
+data/System/MailInContrib.txt 0444 this topic
+data/System/MailInContribTemplate.txt 0444 file of templates
+lib/Foswiki/Contrib/MailInContrib.pm 0444 perl module
+lib/Foswiki/Contrib/MailInContrib/Config.spec 0444 configure spec
 lib/CPAN/lib/Email/Delete/IMAP.pm 0444 Extension to incomplete CPAN module
 lib/CPAN/lib/Email/Delete/POP3.pm 0444 Extension to incomplete CPAN module
-pub/TWiki/MailInContrib/wikiringlogo20x20.png 0660
+pub/System/MailInContrib/wikiringlogo20x20.png 0660

trunk/MailInContrib/lib/Foswiki/Contrib/MailInContrib/build.pl

@@ -1 +1 @@
 #!/usr/bin/perl -w
-#
-# Example build class. Copy this file to the equivalent place in your
-# plugin or contrib and edit.
-#
-# Requires the environment variable FOSWIKI_LIBS (a colon-separated path
-# list) to be set to point at the build system and any required dependencies.
-# Usage: ./build.pl [-n] [-v] [target]
-# where [target] is the optional build target (build, test,
-# install, release, uninstall), test is the default.
-# Two command-line options are supported:
-# -n Don't actually do anything, just print commands
-# -v Be verbose
-#
-
-# Standard preamble
 BEGIN {
   foreach my $pc (split(/:/, $ENV{FOSWIKI_LIBS})) {
@@ -21 +6 @@
 }
 
-use TWiki::Contrib::Build;
-
-# Declare our build package
-{ package MailInBuild;
-
-  @MailInBuild::ISA = ( "TWiki::Contrib::Build" );
-
-  sub new {
-    my $class = shift;
-    return bless( $class->SUPER::new( "MailInContrib" ), $class );
-  }
-
-  # Example: Override the build target
-  sub target_build {
-    my $this = shift;
-
-    $this->SUPER::target_build();
-
-    # Do other build stuff here
-  }
-}
+use Foswiki::Contrib::Build;
 
 # Create the build object
-$build = new MailInBuild();
+$build = new Foswiki::Contrib::Build("MailInContrib");
 
 # Build the target on the command line, or the default target

trunk/MailInContrib/test/unit/MailInContrib/MailInContribSuite.pm

@@ -2 +2 @@
 
 package MailInContribSuite;
-
-use base qw( FoswikiFnTestCase! );
-
-use TWiki;
+use base 'FoswikiFnTestCase';
+
+use Foswiki;
 use Error qw( :try );
 use File::Path;
 use Error qw( :try );
-use TWiki::Contrib::MailInContrib;
+use Foswiki::Contrib::MailInContrib;
 
 my $box;
@@ -23 +22 @@
     $this->{twiki}->{store}->createWeb(
         $this->{twiki}->{user}, $this->{system_web},
-        $TWiki::cfg{SystemWebName} );
+        $Foswiki::cfg{SystemWebName} );
+    my $adm = Foswiki::Func::getCanonicalUserID(
+        $Foswiki::cfg{AdminUserWikiName});
     $this->{twiki}->{store}->saveTopic(
-        $TWiki::cfg{AdminUserWikiName}, $this->{system_web},
+        $adm, $this->{system_web},
         'WebPreferences', "");
 
-    $TWiki::cfg{SystemWebName} = $this->{system_web};
+    $Foswiki::cfg{SystemWebName} = $this->{system_web};
 
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-
-    my $workdir = TWiki::Func::getWorkArea('MailInContrib');
+    $this->{twiki} = new Foswiki();
+
+    my $workdir = Foswiki::Func::getWorkArea('MailInContrib');
     open(F, ">$workdir/timestamp") || die $!;
     print F "0\n";
@@ -50 +51 @@
 
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->{twiki}->net->setMailHandler(\&sentMail);
 
     $box = {};
-
     # Make a maildir
     my $tmp = "/tmp/mail$$";
@@ -62 +62 @@
     $box->{folder} = "$tmp/";
 
-    $TWiki::cfg{MailInContrib} = [ $box ];
+    $Foswiki::cfg{MailInContrib} = [ $box ];
     @mails = ();
 }
@@ -94 +94 @@
 sub cron {
     my $this = shift;
-    my $min = new TWiki::Contrib::MailInContrib( $this->{twiki}, 0 );
+    my $min = new Foswiki::Contrib::MailInContrib( $this->{twiki}, 0 );
     $min->processInbox( $box );
     $min->wrapUp();
@@ -119 +119 @@
 and there is no valid default username', $c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},$this->{test_topic});
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},$this->{test_topic});
 
     $this->assert($t !~ /\S/, $t);
@@ -154 +154 @@
     $this->assert_null($c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},$this->{test_topic});
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},$this->{test_topic});
 
     $this->assert($t =~ s/^ *\* \*$this->{test_web}\.NotHere\*: Message 1 text here\s*-- $this->{users_web}\.MoleInnaHole -\s+\d+\s+\w+\s+\d+\s+-\s+\d+:\d+\n//m, $t);
@@ -190 +190 @@
     $this->assert_null($c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},$this->{test_topic});
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},$this->{test_topic});
 
     $this->assert($t =~ s/^\s*\* \*\*: Message 1 text here\s* -- $this->{users_web}\.MoleInnaHole -\s+\d+\s+\w+\s+\d+\s+-\s+\d+:\d+$//m, $t);
@@ -223 +223 @@
     $this->assert_null($c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},'DangleBerries');
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},'DangleBerries');
 
     $t =~ s/\* \*no valid topic\*: Message 1 text here\s*-- $this->{users_web}.AllyGator -\s+\d+\s+\w+\s+\d+\s+-\s+\d+:\d+//s;
@@ -367 +367 @@
     my $c = $this->cron();
 
+print STDERR "VBLO\n";
     $this->assert_equals(1, scalar(@mails));
     $this->assert_matches(qr/Thank you for your successful/, $mails[0]);
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},'AnotherTopic');
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},'AnotherTopic');
     my @a = $m->get('FILEATTACHMENT');
     $this->assert_equals(1, scalar(@a));
     $this->assert_str_equals("data.asc", $a[0]->{attachment});
 
-    $this->assert(-e "$TWiki::cfg{PubDir}/$this->{test_web}/AnotherTopic/data.asc");
+    $this->assert(-e "$Foswiki::cfg{PubDir}/$this->{test_web}/AnotherTopic/data.asc");
 }
 
@@ -395 +396 @@
     $box->{onSuccess} = 'reply delete';
     $this->{twiki}->{store}->saveTopic(
-        $this->{twiki}->{user}, $TWiki::cfg{SystemWebName},
+        $this->{twiki}->{user}, $Foswiki::cfg{SystemWebName},
         'MailInContribUserTemplate', <<'HERE');
 %TMPL:DEF{MAILIN:wierd}%
@@ -414 +415 @@
     $this->assert_matches(qr/Thank you for your successful/, $mails[0]);
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},'TargetTopic');
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},'TargetTopic');
 
     $this->assert_matches(qr/BEGIN\s*Subject: Object\s*Body: Message 1 text here\s*<!--MAIL{/s, $t);

trunk/MailInContrib/tools/mailincron

@@ -4 +4 @@
 #
 # Copyright (C) 2005 TWiki Contributors. All Rights Reserved.
-# TWiki Contributors are listed in the AUTHORS file in the root
+# 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.
@@ -26 +27 @@
 }
 
-use TWiki::Contrib::MailInContrib;
+use Foswiki::Contrib::MailInContrib;
 
 my $debug;
@@ -43 +44 @@
 }
 
-my $twiki;
-my $folders;
-if( eval 'defined($TWiki::wikiversion)' ) {
-    TWiki::initialize();
-    $twiki = undef;
-    eval "use LocalSite.cfg";
-} else {
-    $twiki = new TWiki();
-    $TWiki::Plugins::SESSION = $twiki;
-}
-$folders = $TWiki::cfg{MailInContrib};
-my $processor = new TWiki::Contrib::MailInContrib($twiki, $debug);
+my $session = new Foswiki();
+my $folders = $Foswiki::cfg{MailInContrib};
+my $processor = new Foswiki::Contrib::MailInContrib($session, $debug);
 foreach my $folder ( @$folders ) {
     $processor->processInbox( $folder );