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 pull request #1951 from webmin/dev/error-less-obscure

Browse Source 
Fix to make errors less obscure
This commit is contained in:
Jamie Cameron
2023-07-12 14:01:28 -07:00
committed by GitHub
parent 21e4debf24 2d85a2951c
commit 50e058d2b6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web-lib-funcs.pl
View File

@@ -1688,6 +1688,17 @@ $main::no_miniserv_userdb = 1;
&setvar('error-fatal', 1);
my $msg = join("", @_);
$msg =~ s/<[^>]*>//g;
my @stack;
for(my $i=0; my @stack_ = caller($i); $i++) {
push(@stack, \@stack_);
}
my $err_caller;
$err_caller = "$stack[1]->[1] (line $stack[1]->[2])"
if ($stack[1]->[1] && $stack[1]->[2]);
if ($err_caller) {
$err_caller =~ s/$root_directory\///;
$main::whatfailed = $main::whatfailed ? "$main::whatfailed : $err_caller" : $err_caller;
}
my $error_details = (($ENV{'WEBMIN_DEBUG'} || $gconfig{'debug_enabled'}) ? "" : "\n");
my $error_output_right = sub {
my ($err_msg) = @_;
@@ -1711,7 +1722,7 @@ if (!$ENV{'REQUEST_METHOD'}) {
&print_call_stack() if ($gconfig{'error_stack'});
}
elsif (defined(&theme_error)) {
&theme_error(@_);
&theme_error({err => \@_, stack => \@stack, err_caller => $err_caller});
}
elsif ($ENV{'REQUEST_URI'} =~ /json-error=1/) {
my %jerror;
@@ -1759,11 +1770,11 @@ else {
print "<tr> <td$cls_err_td><b>$text{'error_file'}</b></td> ",
"<td$cls_err_td><b>$text{'error_line'}</b></td> ",
"<td$cls_err_td><b>$text{'error_sub'}</b></td> </tr>\n";
for($i=0; my @stack = caller($i); $i++) {
foreach my $stack (@stack) {
print "<tr>\n";
print "<td$cls_err_td>$stack[1]</td>\n";
print "<td$cls_err_td>$stack[2]</td>\n";
print "<td$cls_err_td>$stack[3]</td>\n";
print "<td$cls_err_td>$stack->[1]</td>\n";
print "<td$cls_err_td>$stack->[2]</td>\n";
print "<td$cls_err_td>$stack->[3]</td>\n";
print "</tr>\n";
}
print "</table>\n";