[pmg-devel] [PATCH pmg-api v2 2/3] fix #1621: templates: add plain-text variant of short/verbose spam report

[Thomas Lamprecht]

Am 18.09.25 um 16:32 schrieb Hannes Laimer:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
> v2:
> - drop `subject:` line
> 
>  src/Makefile                              |  2 ++
>  src/templates/spamreport-short.plain.tt   |  9 +++++++++
>  src/templates/spamreport-verbose.plain.tt | 18 ++++++++++++++++++
>  3 files changed, 29 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 896319b..b75c818 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..2c13431
> --- /dev/null
> +++ b/src/templates/spamreport-short.plain.tt
> @@ -0,0 +1,9 @@
> +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..1a0c182
> --- /dev/null
> +++ b/src/templates/spamreport-verbose.plain.tt
> @@ -0,0 +1,18 @@
> +[% SET links = [] -%]
> +[% IF items.size -%]
> +Spam quarantine entries for [% pmail %]:
> +
> +[% FOREACH item IN items %]
> +- [% item.date %] [% item.time %] From: [% item.from_plain %]
> +  Subject: [% item.subject_plain %] [% n = links.size + 1; links.push(item.href); %][[% n %]]
> +
> +[% END %]
> +[% ELSE %]
> +No spam entries for the selected period.
> +[% END %]
> +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 %]

Not sure about the reference like link lists at the bottom, if there's more than a
handful of mails in the quarantine it gets quite hard to navigate fast, albeit
searching for the reference number naturally is an option..

Maybe put at least the general link to the web UI at the top? That might be a good
compromise where I do not have to scroll.

I.e., move "Manage your spam quarantine" up and inline the link for that and probably
also to www.proxmox.com as it's very short compared to the quarantine UI links anyway
and not much is gained by placing it as reference link (and do s/http/https/ for that)

Would like to hear some other opinions here (CC'in Fabian, as he is a big plain
text mail user too, but others are naturally welcome to chime in too).

> +[% END %]