From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id C9A211FF15E for ; Mon, 13 Oct 2025 13:07:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 975A711CEB; Mon, 13 Oct 2025 13:07:29 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 13 Oct 2025 13:06:19 +0200 Message-ID: <20251013110719.18486-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251013110719.18486-1-s.ivanov@proxmox.com> References: <20251013110719.18486-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760353609063 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ietf.org, utils.pm, proxmox.com] Subject: [pmg-devel] [PATCH pmg-api 2/2] utils: finalize_report: change order of plain and html parts X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" After 2 reports and a hint in our community forum [0] that the reports are displayed differently since the upgrade - I checked the MIME-RFC: https://datatracker.ietf.org/doc/html/rfc2046#section-5.1.4 which suggests to add the most preferred alternative last (so that text/plain comes in the beginning which is nicer to view for mail-clients which do not handle MIME at all). I had chalked this up to my MUAs preferring text/plain where possible. Tested this by comparing a spamreport sent with this patch applied in * claws-mail * mutt * bluemind webmail * aerc [0] https://forum.proxmox.com/threads/.173435/ Fixes: 542f7279 ("utils: allow specifying plain and/or html for finalize_report()") Signed-off-by: Stoiko Ivanov --- src/PMG/Utils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index a2cd3fc4..52b98c01 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1370,13 +1370,6 @@ sub finalize_report { Subject => bencode_header(decode_entities($title)), ); - if ($html) { - $top->attach( - Data => $html, - Type => "text/html", - Encoding => $debug ? 'binary' : 'quoted-printable', - ); - } if ($plaintext) { $top->attach( Data => $plaintext, @@ -1384,6 +1377,13 @@ sub finalize_report { Encoding => '8-bit', ); } + if ($html) { + $top->attach( + Data => $html, + Type => "text/html", + Encoding => $debug ? 'binary' : 'quoted-printable', + ); + } $top->head()->add('Auto-Submitted', 'auto-generated'); -- 2.47.3 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel