Relax filter: Permit multipart/*, message/rfc822 and text/html, and avoid collapsing parts.

12 files changed, 60 insertions, 60 deletions

diff --git a/mailman/skel/private.en.py b/mailman/skel/private.en.py
index ea356ca..f389345 100644
--- a/mailman/skel/private.en.py
+++ b/mailman/skel/private.en.py
@@ -126,11 +126,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -141,8 +141,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/sig.da.py b/mailman/skel/sig.da.py
index ba0a88f..b9e9a94 100644
--- a/mailman/skel/sig.da.py
+++ b/mailman/skel/sig.da.py
@@ -126,11 +126,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -141,8 +141,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives =0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/sig.en.py b/mailman/skel/sig.en.py
index 32e6cae..2ad3087 100644
--- a/mailman/skel/sig.en.py
+++ b/mailman/skel/sig.en.py
@@ -126,11 +126,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -141,8 +141,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/sig.no.py b/mailman/skel/sig.no.py
index e1ba84a..d681e0f 100644
--- a/mailman/skel/sig.no.py
+++ b/mailman/skel/sig.no.py
@@ -126,11 +126,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -141,8 +141,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team-announce.da.py b/mailman/skel/team-announce.da.py
index 37f4b42..03511ac 100644
--- a/mailman/skel/team-announce.da.py
+++ b/mailman/skel/team-announce.da.py
@@ -125,11 +125,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -140,8 +140,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team-announce.da.py.broken b/mailman/skel/team-announce.da.py.broken
index f353a7f..417f2e5 100644
--- a/mailman/skel/team-announce.da.py.broken
+++ b/mailman/skel/team-announce.da.py.broken
@@ -128,11 +128,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -143,8 +143,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team-announce.en.py b/mailman/skel/team-announce.en.py
index 10c19e9..3c199d3 100644
--- a/mailman/skel/team-announce.en.py
+++ b/mailman/skel/team-announce.en.py
@@ -125,11 +125,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -140,8 +140,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team-announce.no.py b/mailman/skel/team-announce.no.py
index 4bd43c8..aff2d3d 100644
--- a/mailman/skel/team-announce.no.py
+++ b/mailman/skel/team-announce.no.py
@@ -125,11 +125,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -140,8 +140,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team.da.py b/mailman/skel/team.da.py
index 68c63ab..3a4d8ac 100644
--- a/mailman/skel/team.da.py
+++ b/mailman/skel/team.da.py
@@ -129,11 +129,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -144,8 +144,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team.da.py.broken b/mailman/skel/team.da.py.broken
index 4feef3f..34d4e84 100644
--- a/mailman/skel/team.da.py.broken
+++ b/mailman/skel/team.da.py.broken
@@ -131,11 +131,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -146,8 +146,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team.en.py b/mailman/skel/team.en.py
index 99ec972..3b0614d 100644
--- a/mailman/skel/team.en.py
+++ b/mailman/skel/team.en.py
@@ -129,11 +129,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -144,8 +144,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5
diff --git a/mailman/skel/team.no.py b/mailman/skel/team.no.py
index 3f4900b..8581dba 100644
--- a/mailman/skel/team.no.py
+++ b/mailman/skel/team.no.py
@@ -129,11 +129,11 @@ autoresponse_request_text = ''
 autoresponse_graceperiod = 90
 filter_content = False
 filter_mime_types = ''
-pass_mime_types = """multipart/signed
-multipart/mixed
-multipart/alternative
+pass_mime_types = """multipart
+message/rfc822
 application/pgp-signature
 application/pkcs7-signature
+text/html
 text/plain"""
 filter_filename_extensions = """exe
 bat
@@ -144,8 +144,8 @@ scr
 vbs
 cpl"""
 pass_filename_extensions = ''
-collapse_alternatives = True
-convert_html_to_plaintext = True
+collapse_alternatives = 0
+convert_html_to_plaintext = 0
 filter_action = 1
 topics_enabled = 0
 topics_bodylines_limit = 5