michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jamie Cameron
2022-01-28 15:40:21 -08:00
parent f35b08dc94 c6bedaa4f7
commit d17f01b33a
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
software/apt-lib.pl
View File

@@ -43,7 +43,7 @@ foreach (0..100) {
# Run the command
&clean_language();
&open_execute_command(CMD, "$cmd <$yesfile", 2);
&open_execute_command(CMD, "$cmd <".quotemeta($yesfile), 2);
while(<CMD>) {
if (/setting\s+up\s+(\S+)/i && !/as\s+MDA/i) {
push(@rv, $1);

2
web-lib-funcs.pl
View File

@@ -1636,7 +1636,9 @@ by the message setup using that function.
sub error
{
$main::no_miniserv_userdb = 1;
&globals('set', 'error-fatal-ignored', 1);
return if $main::ignore_errors;
&globals('set', 'error-fatal', 1);
my $msg = join("", @_);
$msg =~ s/<[^>]*>//g;
my $error_details = (($ENV{'WEBMIN_DEBUG'} || $gconfig{'debug_enabled'}) ? "" : "\n");

9
webmin/change_log.cgi
View File

@@ -8,6 +8,7 @@ require './webmin-lib.pl';
&lock_file($ENV{'MINISERV_CONFIG'});
&get_miniserv_config(\%miniserv);
my ($miniserv_log, $in_log) = ($miniserv{'log'}, $in{'log'});
$miniserv{'log'} = $in{'log'};
$miniserv{'loghost'} = $in{'loghost'};
$miniserv{'logclf'} = $in{'logclf'};
@@ -61,6 +62,14 @@ $gconfig{'logsyslog'} = $in{'logsyslog'} if (defined($in{'logsyslog'}));
&write_file("$config_directory/config", \%gconfig);
&unlock_file("$config_directory/config");
# Clear links in Virtualmin module if installed
if ($miniserv_log != $in_log) {
if (&foreign_available('virtual-server')) {
&foreign_require("virtual-server");
&virtual_server::clear_links_cache();
}
}
&show_restart_page();
&webmin_log("log", undef, undef, \%in);

2
webmin/letsencrypt-lib.pl
View File

@@ -322,7 +322,7 @@ else {
($mode eq "web" ? "--acme-dir ".quotemeta($challenge)." "
: "--dns-hook $dns_hook ".
"--cleanup-hook $cleanup_hook ").
($staging ? "--ca https://acme-staging.api.letsencrypt.org "
($staging ? "--ca https://acme-staging-v02.api.letsencrypt.org "
: "--disable-check ").
"--quiet ".
"2>&1 >".quotemeta($cert));

11
webminlog/search.cgi
View File

@@ -63,7 +63,7 @@ if ($in{'csv'}) {
&PrintHeader(undef, "text/csv");
}
else {
&ui_print_header(undef, $text{'search_title'}, "");
&ui_print_header(undef, &html_escape($in{'search_title'} || $text{'search_title'}), "", undef, undef, $in{'no_return'});
}
# Perform initial search in index
@@ -179,15 +179,15 @@ if ($in{'csv'}) {
elsif (@match) {
# Show search results in table
if ($in{'sid'}) {
print "<b>",&text('search_sid', "<tt>$match[0]->{'user'}</tt>",
print "<b data-search-action='sid'>",&text('search_sid', "<tt>$match[0]->{'user'}</tt>",
"<tt>$in{'sid'}</tt>")," ..</b><p>\n";
}
elsif ($in{'uall'} == 1 && $in{'mall'} && $in{'tall'}) {
print "<b>$text{'search_critall'} ..</b><p>\n";
print "<b data-search-action='critall'>$text{'search_critall'} ..</b><p>\n";
}
else {
my %minfo = &get_module_info($in{'module'}) if (!$in{'mall'});
print "<b>$text{'search_crit'} $searchmsg ...</b><p>\n";
print "<b data-search-action='crit'>$text{'search_crit'} $searchmsg ...</b><p>\n";
}
print &ui_columns_start(
[ $text{'search_action'},
@@ -216,6 +216,7 @@ elsif (@match) {
push(@cols, &ui_link("view.cgi?id=$act->{'id'}".
"&return=".&urlize($in{'return'} || "").
"&returndesc=".&urlize($in{'returndesc'} || "").
"&no_return=".&urlize($in{'no_return'} || "").
"&file=".($in{'fall'} ? "" : &urlize($in{'file'})).
"&search=".&urlize($in || ""),
&filter_javascript($desc)) );
@@ -240,7 +241,7 @@ else {
print "<p><b>$text{'search_none2'} $searchmsg.</b><p>\n";
}
if (!$in{'csv'}) {
if (!$in{'csv'} && !$in{'no_return'}) {
# Show page footer
if ($in{'return'}) {
&ui_print_footer($in{'return'}, $in{'returndesc'});

9
webminlog/view.cgi
View File

@@ -14,7 +14,7 @@ my $act = &get_action($in{'id'});
&can_mod($act->{'module'}) || &error($text{'view_ecannot'});
# display info about the action
&ui_print_header(undef, $text{'view_title'}, "");
&ui_print_header(undef, $text{'view_title'}, "", undef, undef, $in{'no_return'});
my @files = &list_files($act);
print &ui_form_start("rollback.cgi");
@@ -166,9 +166,8 @@ if (@files && $rbcount) {
else {
print &ui_form_end();
}
&ui_print_footer("search.cgi?search=".&urlize($in{'search'}),
$text{'search_return'},
"", $text{'index_return'});
my @return_index = $in{'no_return'} ? ( ) : ("", $text{'index_return'});
&ui_print_footer("search.cgi?search=".&urlize($in{'search'}), $text{'search_return'},
@return_index);