X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=My-Audit.pm;h=d3e4013b30e3178ad78d56576d09517b734b8f53;hp=81af794cd44dc68b562d2276fb7f7f1a75fb82f5;hb=815d559db331524d589531a8add62fec0f359ea2;hpb=8383e7c164d95dfab1834f22cca130a7b8338b4b

diff --git a/My-Audit.pm b/My-Audit.pm
index 81af794..d3e4013 100644
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -49,6 +49,8 @@ sub audit
 		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>';
 		{
 			# weak detection: files with text/html w/o text/plain are usually a spam
 			my @types_linear=map({ mime_type($_); } parts_linear());
@@ -61,11 +63,15 @@ sub audit
 	return if did sub {
 		local $store_profile="silent";
 		local $_;
+		store "=spam-razor".($_ 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
 		# 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';
 		};
@@ -75,13 +81,14 @@ sub audit
 
 	# ppl-wished foreign remapping, Reply-To is left untouched!
 	header_remap("From",{
-			'kerere@post.cz'            =>'kamzik@k332.feld.cvut.cz',
-			'profes@mbox.vol.cz'        =>'kratochvilova@egp.cz',
-			'jkrouzek@mbox.vol.cz'      =>'krouzek@mbox.fsv.cuni.cz',
-			'jakub.gorner@lidovky.cz'   =>'tonda@disnet.cz',
-			'jan.kolar@videoprogress.cz'=>'jenda.kolar@volny.cz',
-			'daniel.rulicek@cponline.cz'=>'daniel.rulicek@cpress.cz',
-			'pavel@suse.cz'             =>'pavel@ucw.cz',
+			'kerere@post.cz'               =>'kamzik@k332.feld.cvut.cz',
+			'profes@mbox.vol.cz'           =>'kratochvilova@egp.cz',
+			'jkrouzek@mbox.vol.cz'         =>'krouzek@mbox.fsv.cuni.cz',
+			'jakub.gorner@lidovky.cz'      =>'tonda@disnet.cz',
+			'jan.kolar@videoprogress.cz'   =>'jenda.kolar@volny.cz',
+			'daniel.rulicek@cponline.cz'   =>'daniel.rulicek@cpress.cz',
+			'pavel@suse.cz'                =>'pavel@ucw.cz',
+
 			});
 
 	# My obsolete e-mail addresses
@@ -111,12 +118,12 @@ sub audit
 
 	# lists
 	store "=mozillabug","log"    if headeris "From"     ,'<bugzilla-daemon@mozilla.org>';
-	store "=9kc","bell"          if headeris "List-Post",'<n9k@pandora.cz>';
-	store "=9kcd","bell"         if headeris "List-Post",'<dev9k@pandora.cz>';
+	store "=9kc","log"           if headeris "List-Post",'<n9k@pandora.cz>';
+	store "=9kcd","log"          if headeris "List-Post",'<dev9k@pandora.cz>';
 	store "=9ku","log"           if headeris "List-Id"  ,'<9000.listman.net>';
 	store "=9kd","log"           if headeris "Sender"   ,'<owner-9000-developers@geekstuff.co.uk>';
 	store "=spong","log"         if headeris "List-Id"  ,'<spong-users.lists.sourceforge.net>';
-	store "=gtkd","log"          if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
+	store "=gtkd","silent"       if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
 	store "=mffstatnice","bell"  if headeris "List-Post",'<statnice@atrey.karlin.mff.cuni.cz>';
 	store "=hw","log"            if headeris "List-Post",'<hw-news@list.gin.cz>';
 	store "=gnokii","log"        if headeris "List-Id"  ,'<gnokii-users.mail.freesoftware.fsf.org>';