fix bug #1625 - change default rule priorities

diff --git a/PMG/DBTools.pm b/PMG/DBTools.pm
index 5e2974679a33ddb46ae9081c1b67cadc8a65967d..a7c96c4acd5ffb2c38d222dffd903a8287fb2501 100644 (file)
--- a/PMG/DBTools.pm
+++ b/PMG/DBTools.pm
@@ -782,7 +782,7 @@ sub init_ruledb {
     }
 
     # Quarantine/Mark Spam (Level 5)
-    $rule = PMG::RuleDB::Rule->new ('Quarantine/Mark Spam (Level 5)', 79, 0, 0);
+    $rule = PMG::RuleDB::Rule->new ('Quarantine/Mark Spam (Level 5)', 81, 0, 0);
     $ruledb->save_rule ($rule);
 
     $ruledb->rule_add_what_group ($rule, $spam5);
@@ -790,7 +790,7 @@ sub init_ruledb {
     $ruledb->rule_add_action ($rule, $quarantine);
 
     ## Block Spam Level 10
-    $rule = PMG::RuleDB::Rule->new ('Block Spam (Level 10)', 78, 0, 0);
+    $rule = PMG::RuleDB::Rule->new ('Block Spam (Level 10)', 82, 0, 0);
     $ruledb->save_rule ($rule);
 
     $ruledb->rule_add_what_group ($rule, $spam10);

diff --git a/tests/testdb.txt b/tests/testdb.txt
index c604c6462c1cd2989f0ba41d9b9677f6478e62c6..c69f4ed8847a8702920f5a80be2dbdcb088ee08e 100644 (file)
--- a/tests/testdb.txt
+++ b/tests/testdb.txt
@@ -42,13 +42,11 @@ Found RULE 5: Whitelist
     OBJECT 2: mail@fromthisdomain.com
   FOUND ACTION GROUP 16: Accept
     OBJECT 30: accept message
-Found RULE 6: Mark Spam
+Found RULE 8: Block Spam (Level 10)
   FOUND WHAT GROUP 11: Spam (Level 10)
     OBJECT 25: Level 10
-  FOUND ACTION GROUP 12: Modify Spam Level
-    OBJECT 26: modify field: X-SPAM-LEVEL:__SPAM_INFO__
-  FOUND ACTION GROUP 13: Modify Spam Subject
-    OBJECT 27: modify field: subject:SPAM: __SUBJECT__
+  FOUND ACTION GROUP 17: Block
+    OBJECT 31: block message
 Found RULE 7: Quarantine/Mark Spam (Level 5)
   FOUND WHAT GROUP 10: Spam (Level 5)
     OBJECT 24: Level 5
@@ -56,11 +54,13 @@ Found RULE 7: Quarantine/Mark Spam (Level 5)
     OBJECT 27: modify field: subject:SPAM: __SUBJECT__
   FOUND ACTION GROUP 18: Quarantine
     OBJECT 32: Move to quarantine.
-Found RULE 8: Block Spam (Level 10)
+Found RULE 6: Mark Spam
   FOUND WHAT GROUP 11: Spam (Level 10)
     OBJECT 25: Level 10
-  FOUND ACTION GROUP 17: Block
-    OBJECT 31: block message
+  FOUND ACTION GROUP 12: Modify Spam Level
+    OBJECT 26: modify field: X-SPAM-LEVEL:__SPAM_INFO__
+  FOUND ACTION GROUP 13: Modify Spam Subject
+    OBJECT 27: modify field: subject:SPAM: __SUBJECT__
 Found RULE 9: Block outgoing Spam
   FOUND WHAT GROUP 9: Spam (Level 3)
     OBJECT 23: Level 3