Re: [pmg-devel] [PATCH pmg-api v3 1/3] pmgqm: add plain subject/from fields for reports

[Stoiko Ivanov <s.ivanov@proxmox.com>]

pmail would need a _plain variant as well:

When having mails in quarantine for:
`discard€@test.domain`
the rendered (plaint-text) report says:
`1 spam quarantine entries for discard€@test.domain`


On Fri, 19 Sep 2025 10:36:20 +0200
Hannes Laimer <h.laimer@proxmox.com> wrote:

> 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@proxmox.com>
> ---
> v3:
> - add small helper for 1522_decode+utf8_encode
> 
>  src/PMG/CLI/pmgqm.pm | 16 ++++++++++++----
>  src/PMG/Utils.pm     |  9 +++++++++
>  2 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm
> index 41f9f1a..0c30dbe 100755
> --- a/src/PMG/CLI/pmgqm.pm
> +++ b/src/PMG/CLI/pmgqm.pm
> @@ -45,17 +45,25 @@ 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::rfc1522_to_plain_utf8($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 $from = PMG::Utils::rfc1522_to_html($raw_from);
> +    my $from_plain = PMG::Utils::rfc1522_to_plain_utf8($raw_from);
> +
> +    my $raw_sender = PVE::Tools::trim($head->get('sender'));
> +    my $sender = PMG::Utils::rfc1522_to_html($raw_sender);
> +    my $sender_plain = PMG::Utils::rfc1522_to_plain_utf8($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};
> diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
> index 3dc909d..4e35aec 100644
> --- a/src/PMG/Utils.pm
> +++ b/src/PMG/Utils.pm
> @@ -1194,6 +1194,15 @@ sub decode_rfc1522 {
>      return $res;
>  }
>  
> +sub rfc1522_to_plain_utf8 {
> +    my ($enc) = @_;
> +
> +    my $res = eval { Encode::encode('UTF-8', decode_rfc1522($enc)) };
> +    return $enc if $@;
> +
> +    return $res;
> +}
> +
>  sub rfc1522_to_html {
>      my ($enc) = @_;
>  



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel