From: Dominik Csapak <d.csapak@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api] api/postfix: add 'decode-headers' to postfix queue read
Date: Thu, 3 Feb 2022 09:29:23 +0100 [thread overview]
Message-ID: <20220203082925.1780071-1-d.csapak@proxmox.com> (raw)
often, the users want to show the *decoded* header, iow. they want
to see the readable subject,from,to, etc. not the quoted-printable
versions.
so add a new parameter that decodes the header lines as we read them
using MIME::WordDecoder's 'mime_to_perl_string'.
for backwards compatibility, this is not the default in the api
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PMG/API2/Postfix.pm | 8 +++++++-
src/PMG/Postfix.pm | 6 +++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/PMG/API2/Postfix.pm b/src/PMG/API2/Postfix.pm
index ba22637..2dfcc11 100644
--- a/src/PMG/API2/Postfix.pm
+++ b/src/PMG/API2/Postfix.pm
@@ -239,6 +239,12 @@ __PACKAGE__->register_method ({
default => 0,
optional => 1,
},
+ 'decode-header' => {
+ description => "Decodes the header fields.",
+ type => 'boolean',
+ default => 0,
+ optional => 1,
+ },
},
},
returns => { type => 'string' },
@@ -247,7 +253,7 @@ __PACKAGE__->register_method ({
$param->{header} //= 1;
- return PMG::Postfix::postcat($param->{queue_id}, $param->{header}, $param->{body});
+ return PMG::Postfix::postcat($param->{queue_id}, $param->{header}, $param->{body}, $param->{'decode-header'});
}});
__PACKAGE__->register_method ({
diff --git a/src/PMG/Postfix.pm b/src/PMG/Postfix.pm
index d6ad9d7..20f980e 100644
--- a/src/PMG/Postfix.pm
+++ b/src/PMG/Postfix.pm
@@ -5,6 +5,7 @@ use warnings;
use Data::Dumper;
use File::Find;
use JSON;
+use MIME::WordDecoder qw(mime_to_perl_string);
use PVE::Tools;
@@ -162,7 +163,7 @@ sub mailq {
}
sub postcat {
- my ($queue_id, $header, $body) = @_;
+ my ($queue_id, $header, $body, $decode) = @_;
die "no option specified (select header or body or both)"
if !($header || $body);
@@ -178,6 +179,9 @@ sub postcat {
my $res = '';
while (defined(my $line = <$fh>)) {
+ if ($decode) {
+ $line = mime_to_perl_string($line);
+ }
$res .= $line;
}
--
2.30.2
next reply other threads:[~2022-02-03 8:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 8:29 Dominik Csapak [this message]
2022-02-03 8:29 ` [pmg-devel] [PATCH pmg-gui] postfix queues: show decoded headers by default Dominik Csapak
2022-02-03 11:32 ` [pmg-devel] applied: " Thomas Lamprecht
2022-02-03 11:33 ` [pmg-devel] applied: [PATCH pmg-api] api/postfix: add 'decode-headers' to postfix queue read Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220203082925.1780071-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox