From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pmg-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B61341FF161 for <inbox@lore.proxmox.com>; Tue, 8 Oct 2024 13:18:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 295F614411; Tue, 8 Oct 2024 13:18:35 +0200 (CEST) From: Christoph Heiss <c.heiss@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Tue, 8 Oct 2024 13:17:50 +0200 Message-ID: <20241008111753.831405-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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. [pmgreport.pm, plain.tt, pmgqm.pm, quarantine.pm, html.tt, backup.pm, proxmox.com, utils.pm] Subject: [pmg-devel] [PATCH pmg-api v3 0/3] fix #4211: convert quarantine link mail to template X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com> Fixes #4211 [0] by converting the currently hardcoded text for the quarantine link mail to a proper template, enabling users to write their own versions. This series also adds the possibility to specify both a HTML and plaintext template for PMG::Utils::finalize_report() (or just HTML, for backwards compatibility) - as suggested in [1]. [0] https://bugzilla.proxmox.com/show_bug.cgi?id=4211 [1] https://lore.proxmox.com/pmg-devel/20241003172625.49655705@rosa.proxmox.com/ history ======= v1: https://lore.proxmox.com/pmg-devel/20241001125948.605201-1-c.heiss@proxmox.com/ v2: https://lore.proxmox.com/pmg-devel/20241007103214.1006844-1-c.heiss@proxmox.com/ Notable changes v1 -> v2: * add support for plaintext templates in addition to HTML Notable changes v2 -> v3: * add short documentation for email templates diffstat ======== pmg-api: Christoph Heiss (2): utils: allow specifying plain and/or html for finalize_report() fix #4211: convert quarantine link mail to template src/Makefile | 2 ++ src/PMG/API2/Quarantine.pm | 22 ++++++------ src/PMG/Backup.pm | 5 +-- src/PMG/CLI/pmgqm.pm | 5 ++- src/PMG/CLI/pmgreport.pm | 5 ++- src/PMG/Utils.pm | 49 +++++++++++++++++++++++--- src/templates/quarantine-link.html.tt | 13 +++++++ src/templates/quarantine-link.plain.tt | 5 +++ 8 files changed, 85 insertions(+), 21 deletions(-) create mode 100644 src/templates/quarantine-link.html.tt create mode 100644 src/templates/quarantine-link.plain.tt pmg-docs: Christoph Heiss (1): pmgconfig: document support for html and plain-text email templates pmgconfig.adoc | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.46.0 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel