vzdump mail: fix #3136: Add name to plain/text part

The html/text part already has VMID NAME STATUS TIME..., but the text part only
had VMID STATUS TIME... so far. Therefore, add the missing "name" column.

Limit the length of names so that the content of the following columns remains
aligned to the headings. Note that (like before, too) this only works with
monospaced fonts.

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
This commit is contained in:
Dominic Jäger 2020-11-16 10:44:11 +01:00 committed by Thomas Lamprecht
parent 9493ac144b
commit d0610a6b4f

View File

@ -258,18 +258,20 @@ sub sendmail {
# text part
my $text = $err ? "$err\n\n" : '';
$text .= sprintf ("%-10s %-6s %10s %10s %s\n", qw(VMID STATUS TIME SIZE FILENAME));
$text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", qw(VMID NAME STATUS TIME SIZE FILENAME));
foreach my $task (@$tasklist) {
my $vmid = $task->{vmid};
if ($task->{state} eq 'ok') {
$text .= sprintf ("%-10s %-6s %10s %10s %s\n", $vmid,
$text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", $vmid,
substr($task->{hostname}, 0, 20),
$task->{state},
format_time($task->{backuptime}),
format_size ($task->{size}),
$task->{target});
} else {
$text .= sprintf ("%-10s %-6s %10s %8.2fMB %s\n", $vmid,
$text .= sprintf ("%-10s %-20s %-6s %10s %8.2fMB %s\n", $vmid,
substr($task->{hostname}, 0, 20),
$task->{state},
format_time($task->{backuptime}),
0, '-');