X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fpron_spam;h=6a446985622ad306ac8103733173d9642255712d;hp=58181d15dd389e3ac1496df4ca6bb2c74c4805d5;hb=410be3ec5dff965372980f3e6752323933c910fd;hpb=c16762bdde5e2511c6a44cffe65b4195d4f1d6a4

diff --git a/common/pron_spam b/common/pron_spam
index 58181d1..6a44698 100644
--- a/common/pron_spam
+++ b/common/pron_spam
@@ -205,7 +205,7 @@ describe JACKRABBIT2	vibrator spam
 score JACKRABBIT2	3
 
 # blarson 2007-05-09
-body NUDEPIC		/\b(nude|naked|undressed)\s+(pictures?|video|snapshot|pic)\b/i
+body NUDEPIC		/\b(nude|naked|undressed)\s+(pictures?|video|snapshot|pic|photos?)\b/i
 describe NUDEPIC	nude pictures
 score NUDEPIC		2
 
@@ -224,9 +224,10 @@ body XXXBODY		/xxx/i
 describe XXXBODY	Body containing xxx
 score XXXBODY		4
 
-# zobel
-# don 2007-10-25 mod
-body CNSITESPRON	/\bdot\s+cn\b/i
+#zobel
+body __CNSITES1		/\bdot\s+cn\b/i
+body __CNSITES2		/\b\s+cn\b/i
+meta CNSITESPRON	__CNSITES1 || __CNSITES2
 describe CNSITESPRON	dot cn pron
-body CNSITESPRON	4
+score CNSITESPRON	4