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 A54B41FF15C for ; Fri, 19 Sep 2025 10:36:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 13A17107D7; Fri, 19 Sep 2025 10:36:30 +0200 (CEST) From: Hannes Laimer To: pmg-devel@lists.proxmox.com Date: Fri, 19 Sep 2025 10:36:21 +0200 Message-ID: <20250919083622.22955-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250919083622.22955-1-h.laimer@proxmox.com> References: <20250919083622.22955-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758270976108 X-SPAM-LEVEL: Spam detection results: 1 AWL -2.836 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 KAM_SOMETLD_ARE_BAD_TLD 5 .bar, .beauty, .buzz, .cam, .casa, .cfd, .club, .date, .guru, .link, .live, .monster, .online, .press, .pw, .quest, .rest, .sbs, .shop, .stream, .top, .trade, .wiki, .work, .xyz TLD abuse PDS_OTHER_BAD_TLD 0.75 Untrustworthy TLDs 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. [plain.tt, cf.in, proxmox.com, spamreport-short.tt, spamreport-verbose.tt, fetchmailrc.tt, item.date, pmgreport.tt] Subject: [pmg-devel] [PATCH pmg-api v3 2/3] fix #1621: templates: add plain-text variant of short/verbose spam report 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" Signed-off-by: Hannes Laimer --- v3: - drop link for individual mail, now just one link on top for management - add actually needed `subject:` line back in src/Makefile | 2 ++ src/templates/spamreport-short.plain.tt | 17 +++++++++++++++++ src/templates/spamreport-verbose.plain.tt | 22 ++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 src/templates/spamreport-short.plain.tt create mode 100644 src/templates/spamreport-verbose.plain.tt diff --git a/src/Makefile b/src/Makefile index 6c4246f..54825e2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -27,7 +27,9 @@ TEMPLATES = \ fetchmailrc.tt \ pmgreport.tt \ spamreport-verbose.tt \ + spamreport-verbose.plain.tt \ spamreport-short.tt \ + spamreport-short.plain.tt \ main.cf.in \ main.cf.in.demo \ master.cf.in \ diff --git a/src/templates/spamreport-short.plain.tt b/src/templates/spamreport-short.plain.tt new file mode 100644 index 0000000..8ac89b4 --- /dev/null +++ b/src/templates/spamreport-short.plain.tt @@ -0,0 +1,17 @@ +[% IF timespan == 'week' -%] +[% SET title = "Weekly Spam Report for '${pmail}' - ${date}'" -%] +[% ELSIF timespan.substr(timespan.length - 1) == 'h' -%] +[% SET title = "Spam Report (last ${timespan}) for '${pmail}' - ${date}" -%] +[% ELSE -%] +[% SET title = "Daily Spam Report for '${pmail}' - ${date}" -%] +[% END -%] +subject: [% title %] +You received [% mailcount %] spam mail(s). + +[% SET links = [] %] +Manage your spam quarantine: [% n = links.size + 1; links.push(managehref); %][[% n %]] +Powered by Proxmox: [% n = links.size + 1; links.push('http://www.proxmox.com'); %][[% n %]] + +Links: +[% FOREACH l IN links %][% loop.index + 1 %]: [% l %] +[% END %] diff --git a/src/templates/spamreport-verbose.plain.tt b/src/templates/spamreport-verbose.plain.tt new file mode 100644 index 0000000..029a2e9 --- /dev/null +++ b/src/templates/spamreport-verbose.plain.tt @@ -0,0 +1,22 @@ +[% IF timespan == 'week' -%] +[% SET title = "Weekly Spam Report for '${pmail}' - ${date}'" -%] +[% ELSIF timespan.substr(timespan.length - 1) == 'h' -%] +[% SET title = "Spam Report (last ${timespan}) for '${pmail}' - ${date}" -%] +[% ELSE -%] +[% SET title = "Daily Spam Report for '${pmail}' - ${date}" -%] +[% END -%] +subject: [% title %] +[% IF items.size -%] +[% items.size %] spam quarantine entries for [% pmail %]: + +Manage your spam quarantine: [% managehref %] + +[% FOREACH item IN items %] +- [% item.date %] [% item.time %] From: [% item.from_plain %] + Subject: [% item.subject_plain %] + +[% END %] +[% ELSE %] +No spam entries for the selected period. +[% END %] +Powered by Proxmox: https://www.proxmox.com -- 2.47.3 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel