X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=My-Audit.pm;h=d4851298321b056338ab967d90ca9252438df68c;hp=f67dfd1d956171aa1eb96ca0d539ac724a7c717d;hb=4d6338a79427d97190dec21baa42aefe504ba064;hpb=d9358d3afd47cd10415744c43fbd0bf58ca3947e

diff --git a/My-Audit.pm b/My-Audit.pm
index f67dfd1..d485129 100644
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -53,38 +53,38 @@ sub audit
 	return if did sub {
 		local $_;
 		local $store_profile="silent";
-		store "=spamo-k332"   if grep /^\Qshort\@k332.feld.cvut.cz\E/i,Received_for();
+		store "=spam"         if grep /^\Qshort\@k332.feld.cvut.cz\E/i,Received_for();
 		# TODO: foreign violation of RFC 822 section 4.4.4, Subject:.*Automatick.+odpov.+v.+nep.+tomnosti
-		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>';
-		store "=spamo"        if headeris "From",'<e4luck@lists.opt4email.com>';
-		store "=spamo"        if headeris "From",'<mailcontests@lists.servitall.com>';
-		store "=spamo"        if headeris "From",'<canda@lica.cz>';
+		store "=spam"         if headeris "From",'<ghandchi@hotmail.com>';
+		store "=spam"         if headeris "From",'<newsletter@levnapc.cz>';
+		store "=spam"         if headeris "From",'<Tomas@dtpstudio.cz>';
+		store "=spam"         if headeris "From",'<BNcom@email.bn.com>';
+		store "=spam"         if headeris "From",'<e4luck@lists.opt4email.com>';
+		store "=spam"         if headeris "From",'<mailcontests@lists.servitall.com>';
+		store "=spam"         if headeris "From",'<canda@lica.cz>';
 		{
 			# weak detection: files with text/html w/o text/plain are usually a spam
 			my @types_linear=map({ mime_type($_); } parts_linear());
-			store "=spamo-html" if grep({ $_ eq "text/html"; } @types_linear) && !grep({ $_ eq "text/plain"; } @types_linear);
+			store "=spam"       if grep({ $_ eq "text/html"; } @types_linear) && !grep({ $_ eq "text/plain"; } @types_linear);
 			}
-		store "=spamo-big5" if ($_=mimehead(body_first())->mime_attr("Content-Type.charset")) && /^big5/i;
+		store "=spam"         if ($_=mimehead(body_first())->mime_attr("Content-Type.charset")) && /^big5/i;
 		};
 
 	# spam detection
 	return if did sub {
 		local $store_profile="silent";
 		local $_;
-		store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
+		store "=spam".($_ eq 1 ? "" : ";$_")      if $_=razor2();
 		};
 	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
+		store "=spam"                      .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1;	# all hosts
+		store "=spam"                      .";$_","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"                      .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
 		# I don't send viruses but viruses propagate mails of mine
-		store "=spam-av"                                if headeris "X-Mailer",'ravmd/8.3.2';
+		store "=spam"                                   if headeris "X-Mailer",'ravmd/8.3.2';
 		};
 
 	# special delivery