im-147im-147

3 files changed, 82 insertions, 5 deletions

diff --git a/img/dist/IM/dot.im/Config b/img/dist/IM/dot.im/Config
index a7d0fd4d..ab8b609a 100644
--- a/img/dist/IM/dot.im/Config
+++ b/img/dist/IM/dot.im/Config
@@ -104,8 +104,11 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #rpath=append			# conversion of UNIX From into Return-Path:
 #PopHistory=pophist-{POPSERVERID}	# to save last state (relative to ~/.im/)
 #NntpHistory=newshist		# to save last state (relative to ~/.im/)
-#MBoxStyle=qmail			# if folder style mbox of qmail is used
-#Imget.Src=local:${HOME}/Maildir	# in case of qmail
+#MboxFilter=bogofilter -p -M -I	# filter for mbox file
+#MboxFilter=spamoracle mark
+#MBoxFilter=bsfilter --spam-cutoff 0.85 --pipe --insert-flag --mbox 2>/dev/null
+#MBoxStyle=qmail		# in case of qmail (maildir format)
+#Imget.Src=local:${HOME}/Maildir
 #UseCL=no			# Use value of Content-Length header
 #NoSync=no			# Do not need fsync(2) on writing file
 #FsyncNumber=0			# if 0, system call number of fsync is guessed
@@ -118,9 +121,9 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #Keep=7				# preserve read messages on server
 #ProtoKeep=UIDL			# how to know which message is unread
 				# (UIDL, LAST, STATUS, MSGID)
-#IgnorePostPet=yes		# leave messages for PostPet on mbox (POP only)
+#IgnorePostPet=yes		# leave messages for PostPet on POP server
 
-#Imget.Src=imap
+#Imget.Src=imap%INBOX
 #ImapAccount=/AUTH@localhost	# account info for IMAP access
 #ImapAccount=/AUTH:user@host	# account info with user name
 #HttpProxy=proxy-server:8080	# proxy server for HTTP access
@@ -151,6 +154,7 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #FccDir=$MailDir		# directory for FCC folders
 #QueueDir=queue			# directory for to store messages to be sent
 #UseXDispatcher=yes		# use X-Dispatcher field
+#MsgIdUser=${USER}		# user part for creation of Message-Id:
 #MsgIdDomain=${HOST}		# if you want to use FQDN of dispatching host
 #ObeyMTAdomain=yes		# do not append domainpart to addresses by imput
 #NoMsgIdForNews=yes		# do not insert Message-Id: when posting as news
diff --git a/img/dist/IM/dot.im/get.sbr b/img/dist/IM/dot.im/get.sbr
index 3943631e..b3c59001 100644
--- a/img/dist/IM/dot.im/get.sbr
+++ b/img/dist/IM/dot.im/get.sbr
@@ -36,7 +36,7 @@ sub get_sub ($$$) {
 	    print SEQ "$_: $hash{$_}\n";
 	}
 
-	close (SEQ);
+	close(SEQ);
     }
 }
 
diff --git a/img/dist/IM/dot.im/get.sbr.refile b/img/dist/IM/dot.im/get.sbr.refile
new file mode 100644
index 00000000..b814889c
--- /dev/null
+++ b/img/dist/IM/dot.im/get.sbr.refile
@@ -0,0 +1,73 @@
+# Auto refiling for imget  -*-Perl-*-
+
+use IM::File qw(im_rename);
+
+sub get_sub ($$$) {
+    my($folder, $first, $last) = @_;
+    my($header, $flie, $new_folder, $new_file, $tmp_str, $dir, $msg);
+    my($touch_file, $touch_file_m, $touch_file_n);
+
+    return if ($folder ne &inbox_folder());
+
+    $dir = &expand_path($folder);
+    $touch_file = "$dir/.im_getsbr_touch";
+
+    if (-e $touch_file) {
+	$touch_file_m = -M $touch_file;
+	$touch_file_n = 0;
+	if (open(FH, $touch_file)) {
+	    while (<FH>) {
+		chomp;
+		$touch_file_n = $_;
+	    }
+	    close(FH);
+	}
+	for ($msg = $last; $msg >= $first; $msg--) {
+	    $file = &message_name($folder, $msg);
+	    if (! -e $file) {
+		last;
+	    }
+	    if (-M $file > $touch_file_m) {
+		last;
+	    }
+	    if (-M $file == $touch_file_m && $msg <= $touch_file_n) {
+		last;
+	    }
+	}
+	$first = $msg + 1;
+    }
+
+    for ($msg = $first; $msg <= $last; $msg++) {
+	$file = &message_name($folder, $msg);
+	if (open(MSG, "$file")) {
+	    $tmp_str = $/;
+	    $/ = "\n\n";
+	    $header = <MSG>;
+	    $/ = $tmp_str;
+
+	    $new_folder = $folder;
+	    if ($header =~ /(^|\n)X-Bogosity: Yes/) {
+		$new_folder = '+spam';
+	    } elsif ($header =~ /(^|\n)X-Spam-Flag: Yes/) {
+		$new_folder = '+spam';
+	    } elsif ($header =~ /(^|\n)X-Spam: yes/) {
+		$new_folder = '+spam';
+#	    } elsif ($header =~ /(^|\n)X-ML-Name: mew-dist/) {
+#		$new_folder = '+mew-dist';
+	    }
+	    if ($new_folder ne $folder) {
+		$new_file = &message_name($new_folder, 'new') || die $!;
+		&im_notice("refiling $folder/$msg to $new_folder.\n");
+		&im_rename($file, $new_file) || die $!;
+	    }
+	    close(MSG);
+	}
+    }
+
+    if (open(FH, ">$touch_file")) {
+	print FH "$last\n";
+	close(FH);
+    }
+}
+
+1;