From: David Bremner <bremner@unb.ca>
Date: Thu, 28 Aug 2008 00:16:13 +0000 (-0300)
Subject: Revert attachment filtering commits
X-Git-Tag: 0.4~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f45a3a625fb6ad194e851bba7b5e5ba025f1a3c;p=ikiwiki.git

Revert attachment filtering commits
---

diff --git a/IkiWiki/Plugin/mailbox.pm b/IkiWiki/Plugin/mailbox.pm
index 5e24a3b4d..d925e42be 100644
--- 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+
 
-use Email::FolderType qw(folder_type);
 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;
 
+use Email::FolderType qw(folder_type);
 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);
-	IkiWiki::loadplugin("filecheck");
 } # }}}
 
 sub scan(@){
@@ -129,8 +128,6 @@ sub format_message(@){
 
     $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);
 
diff --git a/test/test.setup b/test/test.setup
index 512f14fbb..82b725e30 100644
--- a/test/test.setup
+++ b/test/test.setup
@@ -139,9 +139,7 @@ use IkiWiki::Setup::Standard {
 	#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.