From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 24 May 2016 11:31:06 +0000 (+0100)
Subject: [Fix] Simplify MISSING_MIMEOLE rule
X-Git-Tag: 1.3.0~441
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=517299eeedecb182bafa4937de5f8daabe8c10f3;p=rspamd.git

[Fix] Simplify MISSING_MIMEOLE rule
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 8a3dad9e7..190887c23 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -355,12 +355,11 @@ reconf['FAKE_REPLY_C'] = string.format('(%s) & (%s) & (%s) & !(%s)', subj_re, mi
 local has_msmail_pri = 'header_exists(X-MSMail-Priority)'
 local has_mimeole = 'header_exists(X-MimeOLE)'
 local has_squirrelmail_in_mailer = 'X-Mailer=/SquirrelMail\\b/H'
-local has_ips_php_in_mailer = 'X-Mailer=/^IPS PHP Mailer/'
 local has_office12145_in_mailer = 'X-Mailer=/^Microsoft (?:Office )?Outlook 1[245]\\.0/'
-reconf['MISSING_MIMEOLE'] = string.format('(%s) & !(%s) & !(%s) & !(%s) & !(%s) & !(%s) & !(%s)',
-  has_msmail_pri, has_mimeole,
-  has_squirrelmail_in_mailer, xm_mso12,
-  xm_cgpmapi, has_ips_php_in_mailer,
+reconf['MISSING_MIMEOLE'] = string.format('(%s) & !(%s) & !(%s) & !(%s)',
+  has_msmail_pri,
+  has_mimeole,
+  has_squirrelmail_in_mailer,
   has_office12145_in_mailer)
 
 -- Header delimiters