Revert attachment filtering commits

diff --git a/IkiWiki/Plugin/mailbox.pm b/IkiWiki/Plugin/mailbox.pm
index 5e24a3b4d43f38012c59ca934735097f70b6ccd9..d925e42be0d2b6ca7e3ae2476a5ce79524436b3d 100644 (file)
--- a/IkiWiki/Plugin/mailbox.pm
+++ b/IkiWiki/Plugin/mailbox.pm
@@ -4,7 +4,6 @@
 # Copyright (c) 2008 David Bremner <bremner@unb.ca>
 # This file is distributed under the Artistic License/GPL2+
 
 # Copyright (c) 2008 David Bremner <bremner@unb.ca>
 # This file is distributed under the Artistic License/GPL2+
 

-use Email::FolderType qw(folder_type);

 use Email::MIME;
 package Email::MIMEFolder;
 use base 'Email::Folder';
 use Email::MIME;
 package Email::MIMEFolder;
 use base 'Email::Folder';


@@ -13,6 +12,7 @@ sub bless_message { return  Email::MIME->new($_[1]) };
 
 package IkiWiki::Plugin::mailbox;
 
 
 package IkiWiki::Plugin::mailbox;
 

+use Email::FolderType qw(folder_type);

 use IkiWiki 2.00;
 use Email::Thread;
 use CGI 'escapeHTML';
 use IkiWiki 2.00;
 use Email::Thread;
 use CGI 'escapeHTML';


@@ -27,7 +27,6 @@ sub import { #{{{
        hook(type => "preprocess", id => "mailbox", call => \&preprocess);
        hook(type => "scan", id => "mailbox", call => \&scan);
        hook(type => "pagetemplate", id=>"mailbox", call => \&pagetemplate);
        hook(type => "preprocess", id => "mailbox", call => \&preprocess);
        hook(type => "scan", id => "mailbox", call => \&scan);
        hook(type => "pagetemplate", id=>"mailbox", call => \&pagetemplate);

-       IkiWiki::loadplugin("filecheck");

 } # }}}
 
 sub scan(@){
 } # }}}
 
 sub scan(@){


@@ -129,8 +128,6 @@ sub format_message(@){
 
     $template->param(HEADERS=>[@headers]);
 
 
     $template->param(HEADERS=>[@headers]);
 

-    my $filter=$params{filter} ||  "maxsize(100k) and mimetype(text/plain)";
-    my @good_parts=filter_parts($filter,$message->parts;

 
     my $body= join("\n", map { $_->body }  $message->parts);
 
 
     my $body= join("\n", map { $_->body }  $message->parts);
 

diff --git a/test/test.setup b/test/test.setup
index 512f14fbb7a8f42916cb3f34d4b7ee2097558e7f..82b725e3006d803f3fa47a87e8ef6f46e2363c6b 100644 (file)
--- a/test/test.setup
+++ b/test/test.setup
@@ -139,9 +139,7 @@ use IkiWiki::Setup::Standard {
        #multimarkdown => 1,
 
        # To add plugins, list them here.
        #multimarkdown => 1,
 
        # To add plugins, list them here.

-       # you probably want filecheck if you are getting mail from someone 
-       # other than yourself.
-           add_plugins=>[qw{filecheck mailbox}],
+           add_plugins=>[qw{mailbox}],

        #add_plugins => [qw{goodstuff search wikitext camelcase
        #                   htmltidy fortune sidebar map rst anonok}],
        # If you want to disable any of the default plugins, list them here.
        #add_plugins => [qw{goodstuff search wikitext camelcase
        #                   htmltidy fortune sidebar map rst anonok}],
        # If you want to disable any of the default plugins, list them here.