From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] mail.cgi: Fixes bug#13040 - Change multipart/mixed to
 multipart/alternative
Date: Mon, 20 Feb 2023 17:30:01 +0100
Message-ID: <20230220163003.3434540-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5717637281385681052=="
List-Id: <development.lists.ipfire.org>

--===============5717637281385681052==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Thunderbird and Roundcube mail clients presume that any mail with Content T=
ype of
   multipart/mixed has an attachment included rather than actually checking f=
or
   disposition attachment. This means that any mail with multipart/mixed gets=
 the
   attachment icon marked up even though there is no attachment.
- Although this is a problem of the clients involved, in this case the simple=
st solution
   is to change multipart/mixed to multipart/alternative as the Mail Service =
test mail only
   sends text without any attachment or other part.
- Confirmed on my vm testbed

Fixes: Bug#13040
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/mail.cgi | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
index 34f52ae01..0ed3dfeca 100644
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -297,7 +297,7 @@ sub testmail {
 		To		=3D> $mail{'RECIPIENT'},
 		#Cc		=3D> 'some(a)other.com, some(a)more.com',
 		Subject	=3D> 'IPFire Testmail',
-		Type	=3D> 'multipart/mixed'
+		Type	=3D> 'multipart/alternative'
 	);
=20
 	### Add parts (each "attach" has same arguments as "new"):
@@ -306,15 +306,6 @@ sub testmail {
 		Data	=3D> "This is the IPFire test mail."
 	);
=20
-	### Add attachment for testing
-	#$msg->attach(
-	#	Type     =3D> 'application/txt',
-	#	Encoding =3D> 'base64',
-	#	Path     =3D> '/var/ipfire/dma/dma.conf',
-	#	Filename =3D> 'dma.conf',
-	#	Disposition =3D> 'attachment'
-	#);
-
 	$msg->send_by_sendmail;
 }
=20
--=20
2.39.2


--===============5717637281385681052==--