Merge branch 'master' of github.com:webmin/webmin

This commit is contained in:
Jamie Cameron
2022-09-10 22:13:48 -07:00
3 changed files with 12 additions and 2 deletions

View File

@@ -49,7 +49,7 @@ if (@servers) {
print "<p>";
}
else {
print "<b>$text{'slaves_none'}</b><p>\n";
print "<p>$text{'slaves_none'}</p>\n";
}
# Get all Webmin servers and groups
@@ -109,7 +109,7 @@ if (@addservers || @groups) {
print &ui_form_end([ [ undef, $text{'slaves_ok'} ] ]);
}
else {
print "<b>",&text('slaves_need', '../servers/'),"</b><p>\n";
print "<p>",&text('slaves_need', '../servers/'),"</p>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -11,6 +11,8 @@ if ($in{'global'}) {
}
elsif ($in{'new'}) {
&ui_print_header(undef, $text{'edit_title2'}, "", "create");
$log = $conf->[$in{'clone'}], $lconf = $log->{'members'}
if ($in{'clone'});
}
else {
&ui_print_header(undef, $text{'edit_title1'}, "", "edit");
@@ -177,6 +179,13 @@ else {
print &ui_form_end([ [ 'save', $text{'save'} ],
[ 'now', $text{'edit_now'} ],
[ 'delete', $text{'delete'} ] ], "100%");
print &ui_form_start("edit_log.cgi",
undef, undef, undef, 'ui_form ui_table_end_submit_right');
print &ui_hidden("clone", $in{'idx'});
print &ui_hidden("new", 1);
print &ui_submit($text{'edit_clone'});
print &ui_form_end();
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -64,6 +64,7 @@ edit_pre=Commands to run before rotation
edit_default=Default ($1)
edit_sharedscripts=Only run scripts once for all files?
edit_now=Rotate Now
edit_clone=Clone
global_title=Global Options
global_header=Default options for all log files