X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=My-Audit.pm;h=34615f53e7712ce2b3f581c6ec3391b850d0e656;hp=781288d4d2552651fd449ab0f2240e15b3ce69be;hb=f37bfb2c845363980fc8d55e50333f995e5e65d9;hpb=07dc23479fff656e8e8c715d2e9177e3eab2ad2a

diff --git a/My-Audit.pm b/My-Audit.pm
index 781288d..34615f5 100644
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -22,7 +22,7 @@ sub audit_init
 	@alternates_host=(
 			"jabberwock.ucw.cz",	# short@ucw.cz
 			"atrey.karlin.mff.cuni.cz",	# short@atrey.karlin.mff.cuni.cz
-			"k332.feld.cvut.cz",	# k332.feld.cvut.cz
+			"k332.feld.cvut.cz",	# short@k332.feld.cvut.cz
 			);
 }
 
@@ -39,18 +39,6 @@ sub audit
 			|| headerhas "From",'<Regexp:^owner->'
 			);
 
-	# spam detection
-	return if did sub {
-		local $store_profile="silent";
-		local $_;
-		store "=spam-abuse"                .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;	# all hosts
-		# we don't check all hosts as they can be "dialup" category, FIXME: check for it
-		store "=spam-five"                 .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
-		store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
-		# I don't send viruses but viruses propagate mails of mine
-		store "=spam-av"                                if headeris "X-Mailer",'ravmd/8.3.2';
-		};
-
 	# spam honeypots
 	return if did sub {
 		local $_;
@@ -60,6 +48,7 @@ sub audit
 		store "=spamo"        if headeris "From",'<ghandchi@hotmail.com>';
 		store "=spamo"        if headeris "From",'<newsletter@levnapc.cz>';
 		store "=spamo"        if headeris "From",'<Tomas@dtpstudio.cz>';
+		store "=spamo"        if headeris "From",'<BNcom@email.bn.com>';
 		{
 			# weak detection: files with text/html w/o text/plain are usually a spam
 			my @types_linear=map({ mime_type($_); } parts_linear());
@@ -68,6 +57,19 @@ sub audit
 		store "=spamo-big5" if ($_=mimehead(body_first())->mime_attr("Content-Type.charset")) && /^big5/i;
 		};
 
+	# spam detection
+	return if did sub {
+		local $store_profile="silent";
+		local $_;
+		store "=spam-orbs"                 .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1;	# all hosts
+		store "=spam-abuse"                .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;	# all hosts
+		# we don't check all hosts as they can be "dialup" category, FIXME: check for it
+		store "=spam-five"                 .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
+		store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
+		# I don't send viruses but viruses propagate mails of mine
+		store "=spam-av"                                if headeris "X-Mailer",'ravmd/8.3.2';
+		};
+
 	# special delivery
 	store "=err","bell" and return if headerhas \&Received_for,'<short+err@>';
 
@@ -126,6 +128,7 @@ sub audit
 	store "=ros","log"           if headeris "List-Post",'<ros-general@reactos.com>';
 	store "=roskernel","log"     if headeris "List-Post",'<ros-kernel@reactos.com>';
 	store "=roscvs","silent"     if headeris "List-Post",'<ros-cvs@reactos.com>';
+	store "=rosbug","bell"       if headeris "Reply-To" ,'<scarab@reactos.wox.org>';
 	store "=fsd","log"           if headeris "X-Mailing-List",'<linux-fsdevel@vger.kernel.org>';
 	store "=surprise","sms"      if headeris "List-Post",'<surprise@atrey.karlin.mff.cuni.cz>';
 	store "=surprisesuse","sms"  if headeris "Sender"   ,'<owner-surprise@suse.cz>';
@@ -143,8 +146,11 @@ sub audit
 	store "=4c","sms"            if headeris "List-Post",'<4cinfo@atrey.karlin.mff.cuni.cz>';
 	store "=slashdot","bell"     if headeris "From"     ,'<slashdot@slashdot.org>';
 	store "=freshmeat","bell"    if headeris "From"     ,'<noreply@freshmeat.net>';
+	store "=sourceforge","bell"  if headeris "From"     ,'<noreply@sourceforge.net>';
 	store "=gsmperlcvs","silent" if headeris("From"     ,'<johan@intra.tektonica.com>')
 	                                && $Audit->subject()=~/^'.*' has been updated!$/;
+	store "=libtoold","bell"     if headeris "List-Id"  ,'<libtool.gnu.org>';
+	store "=libtoolpat","bell"   if headeris "List-Id"  ,'<libtool-patches.gnu.org>';
 	# own webs
 	store "=energie","bell"      if headeris "From"     ,qr/^EnergieWeb/;
 
@@ -156,15 +162,31 @@ sub audit
 	store "==","sms"             if !did;
 }
 
+sub audit_sms_address
+{
+my($obj)=@_;
+
+	my $address=$obj->address();
+	if (my $alternates=muttrc_get("alternates")) {
+		return "I" if $address=~/$alternates/si;
+		}
+	my %aliases=muttrc_aliases();
+	if (my $alias=$aliases{lc $address}) {
+		local $_=$alias;
+		s/\.cz$//i;
+		return $_;
+		}
+	local $_=$address;
+	s/\b(Bus)siness$/$1/i;
+	s/\.ident$//i;
+	return $_;
+}
+
 sub audit_sms
 {
 my(%args)=@_;
 
-	my $from=(@{$args{"from"}} ? join(",",map({
-			s/\.cz$//i;
-			s/\b(Bus)siness$/$1/i;
-			$_;
-			} @{$args{"from"}})) : "?");
+	my $from=(@{$args{"from"}} ? join(",",map({ audit_sms_address($_); } @{$args{"from"}})) : "?");
 	local $_;
 
 	$_=$args{"subject"};
@@ -182,14 +204,15 @@ my(%args)=@_;
 	# max. 9 lines of .sig
 	s/\n-- (?:\n[^\n]*){0,9}$//gs;
 	# "Original Message"/"Puvodni zprava" etc. up to empty line
-	s/(^|\n)[\s^\n]*-----[\w\s]*-----[\s^\n]*(?:\n[^\n]+)*\n{2,}(?:\s*[^>\s].*$)?/\n/gs;
+	# "- - - Original message: - - -" is by "Lotus Notes Release 5.0.5  September 22, 2000"
+	s/(^|\n)[\s^\n]*(?:-----[\w\s]*-----|- - - Original message: - - -)[\s^\n]*(?:\n[^\n]+)*\n{2,}(?:\s*[^>\s].*$)?/\n/gs;
 	# Remove "..." lines (is it used by anyone except me?)
 	s/^\Q...\E$/*/gm;
 	# quoting "> "
-	s/^\s*[>][>\s]*.*$/*/gm;
+	s/^(?:\s*[[:upper:]]{0,3}>)+.*$/*/gm;
 	s/(?:^|\n)(?:\*\n+)+/\n*\n/gs;
 	# attributions
-	s/^.*\b(?:wrote|writes):\s*$//gm;
+	s/^.*\b(?:wrote|writes|napsal jste):\s*$//gm;
 	my $body=$_;
 
 	return [$from,"($subject)$body"];