michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly respect the global notification address

Browse Source
This commit is contained in:
Jamie Cameron
2025-10-26 21:32:47 -07:00
parent 5d67cdb7c1
commit e0e5ef65f8
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backup-config/backup.pl
View File

@@ -5,7 +5,7 @@ use strict;
use warnings; use warnings;
no warnings 'redefine'; no warnings 'redefine';
no warnings 'uninitialized'; no warnings 'uninitialized';
our (%text, %config, $no_acl_check); our (%text, %config, $no_acl_check, %gconfig);
$no_acl_check++; $no_acl_check++;
require './backup-config-lib.pl'; require './backup-config-lib.pl';
&foreign_require("mailboxes", "mailboxes-lib.pl"); &foreign_require("mailboxes", "mailboxes-lib.pl");
@@ -76,11 +76,10 @@ if (($err || $backup->{'emode'} == 0) && $backup->{'email'}) {
$postmsg; $postmsg;
$subject = &text('email_sok', $host); $subject = &text('email_sok', $host);
} }
&mailboxes::send_text_mail($config{'from_addr'} || &mailboxes::send_text_mail(
&mailboxes::get_from_address(), $config{'from_addr'} || &mailboxes::get_from_address(),
$backup->{'email'}, $backup->{'email'} eq '*' ? $gconfig{'webmin_email_to'}
undef, : $backup->{'email'},
$subject, undef, $subject, $msg);
$msg);
} }

8
backup-config/edit.cgi
View File

@@ -10,10 +10,11 @@ our (%in, %text, %gconfig);
&ReadParse(); &ReadParse();
my $backup; my $backup;
my $wet = $gconfig{'webmin_email_to'};
if ($in{'new'}) { if ($in{'new'}) {
&ui_print_header(undef, $text{'edit_title1'}, ""); &ui_print_header(undef, $text{'edit_title1'}, "");
$backup = { 'emode' => 0, $backup = { 'emode' => 0,
'email' => $gconfig{'webmin_email_to'}, 'email' => $wet ? '*' : undef,
'sched' => 1, 'sched' => 1,
'configfile' => 1, 'configfile' => 1,
'nofiles' => 0, 'nofiles' => 0,
@@ -74,7 +75,10 @@ print &ui_hidden_table_start($text{'edit_header3'}, "width=100%", 2,
# Show email address # Show email address
print &ui_table_row($text{'edit_email'}, print &ui_table_row($text{'edit_email'},
&ui_textbox("email", $backup->{'email'}, 40)); $wet ? &ui_opt_textbox("email",
$backup->{'email'} eq '*' ? undef : $backup->{'email'},
40, &text('edit_email_def', "<tt>$wet</tt>"))
: &ui_textbox("email", $backup->{'email'}, 40));
# Show email mode # Show email mode
print &ui_table_row($text{'edit_emode'}, print &ui_table_row($text{'edit_emode'},

1
backup-config/lang/en
View File

@@ -27,6 +27,7 @@ edit_header=Scheduled backup options
edit_header2=Pre and post backup commands edit_header2=Pre and post backup commands
edit_header3=Backup schedule edit_header3=Backup schedule
edit_email=Email result to address edit_email=Email result to address
edit_email_def=Webmin default ($1)
edit_emode=When to send email edit_emode=When to send email
edit_emode0=Always edit_emode0=Always
edit_emode1=Only when an error occurs edit_emode1=Only when an error occurs

2
backup-config/save.cgi
View File

@@ -36,7 +36,7 @@ else {
$backup->{'dest'} = &parse_backup_destination("dest", \%in); $backup->{'dest'} = &parse_backup_destination("dest", \%in);
&cron::parse_times_input($backup, \%in); &cron::parse_times_input($backup, \%in);
$backup->{'emode'} = $in{'emode'}; $backup->{'emode'} = $in{'emode'};
$backup->{'email'} = $in{'email'}; $backup->{'email'} = $in{'email_def'} ? '*' : $in{'email'};
$backup->{'pre'} = $in{'pre'}; $backup->{'pre'} = $in{'pre'};
$backup->{'post'} = $in{'post'}; $backup->{'post'} = $in{'post'};
$backup->{'sched'} = $in{'sched'}; $backup->{'sched'} = $in{'sched'};