[pmg-devel] [PATCH pmg-api 1/3] pmgqm: add plain subject/from fields for reports
Hannes Laimer
h.laimer at proxmox.com
Thu Sep 18 12:30:54 CEST 2025
We don't want plain-text reports to contain HTML-escaped chars,
this skips html encoding for the plain-text part.
Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
---
src/PMG/CLI/pmgqm.pm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm
index 41f9f1a..acac284 100755
--- a/src/PMG/CLI/pmgqm.pm
+++ b/src/PMG/CLI/pmgqm.pm
@@ -45,17 +45,26 @@ sub get_item_data {
$item->{id} = sprintf("C%dR%dT%d", $ref->{cid}, $ref->{rid}, $ref->{ticketid});
- $item->{subject} =
- PMG::Utils::rfc1522_to_html(PVE::Tools::trim($head->get('subject')) || 'No Subject');
+ my $raw_subject = PVE::Tools::trim($head->get('subject')) || 'No Subject';
+ $item->{subject} = PMG::Utils::rfc1522_to_html($raw_subject);
+ $item->{subject_plain} = PMG::Utils::decode_rfc1522($raw_subject);
- my $from = PMG::Utils::rfc1522_to_html(PVE::Tools::trim($head->get('from') // $ref->{sender}));
- my $sender = PMG::Utils::rfc1522_to_html(PVE::Tools::trim($head->get('sender')));
+ my $raw_from = PVE::Tools::trim($head->get('from') // $ref->{sender});
+ my $raw_sender = PVE::Tools::trim($head->get('sender'));
+
+ my $from = PMG::Utils::rfc1522_to_html($raw_from);
+ my $sender = PMG::Utils::rfc1522_to_html($raw_sender);
+
+ my $from_plain = PMG::Utils::decode_rfc1522($raw_from);
+ my $sender_plain = PMG::Utils::decode_rfc1522($raw_sender);
if ($sender) {
$item->{sender} = $sender;
$item->{from} = sprintf("%s on behalf of %s", $sender, $from);
+ $item->{from_plain} = sprintf("%s on behalf of %s", $sender_plain, $from_plain);
} else {
$item->{from} = $from;
+ $item->{from_plain} = $from_plain;
}
$item->{envelope_sender} = $ref->{sender};
--
2.47.3
More information about the pmg-devel
mailing list