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

Fix to treat command line output correctly

Browse Source 
Ref.: 1f34cb4994
This commit is contained in:
Ilia Rostovtsev
2020-10-05 18:27:29 +03:00
parent 3bcc674f0f
commit 02e8ada005
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web-lib-funcs.pl
View File

@@ -1509,8 +1509,12 @@ $main::no_miniserv_userdb = 1;
my $msg = join("", @_);
$msg =~ s/<[^>]*>//g;
my $error_details = (($ENV{'WEBMIN_DEBUG'} || $gconfig{'debug_enabled'}) ? "" : "\n");
my $error_output_right = sub {
my ($err_msg) = @_;
return $main::webmin_script_type eq 'cmd' ? entities_to_ascii($err_msg) : $err_msg;
};
if (!$main::error_must_die) {
print STDERR "Error: ",$msg,"\n";
print STDERR "Error: ", &$error_output_right($msg), "\n";
}
&load_theme_library();
if ($main::error_must_die) {
@@ -1522,7 +1526,7 @@ if (!$ENV{'REQUEST_METHOD'}) {
print STDERR "$text{'error'}\n";
print STDERR "-----\n";
print STDERR ($main::whatfailed ? "$main::whatfailed : " : ""),
$msg,"\n";
&$error_output_right($msg),"\n";
print STDERR "-----\n";
if ($gconfig{'error_stack'}) {
# Show call stack