Util.pm (interchange-5.8.2) | : | Util.pm (interchange-5.10.0) | ||
---|---|---|---|---|
skipping to change at line 1744 | skipping to change at line 1744 | |||
my $msg; | my $msg; | |||
if (my $tpl = $Global::DebugTemplate) { | if (my $tpl = $Global::DebugTemplate) { | |||
my %debug; | my %debug; | |||
$tpl = POSIX::strftime($tpl, localtime()); | $tpl = POSIX::strftime($tpl, localtime()); | |||
$tpl =~ s/\s*$//; | $tpl =~ s/\s*$//; | |||
$debug{page} = $Global::Variable->{MV_PAGE}; | $debug{page} = $Global::Variable->{MV_PAGE}; | |||
$debug{tag} = $Vend::CurrentTag; | $debug{tag} = $Vend::CurrentTag; | |||
$debug{host} = $CGI::host || $CGI::remote_addr; | $debug{host} = $CGI::host || $CGI::remote_addr; | |||
$debug{remote_addr} = $CGI::remote_addr; | $debug{remote_addr} = $CGI::remote_addr; | |||
$debug{request_method} = $CGI::request_method; | ||||
$debug{request_uri} = $CGI::request_uri; | ||||
$debug{catalog} = $Vend::Cat; | $debug{catalog} = $Vend::Cat; | |||
if($tpl =~ /\{caller\d+\}/i) { | if($tpl =~ /\{caller\d+\}/i) { | |||
my @caller = caller(); | my @caller = caller(); | |||
for(my $i = 0; $i < @caller; $i++) { | for(my $i = 0; $i < @caller; $i++) { | |||
$debug{"caller$i"} = $caller[$i]; | $debug{"caller$i"} = $caller[$i]; | |||
} | } | |||
} | } | |||
$tpl =~ s/\{session\.([^}|]+)(.*?)\}/ | ||||
$debug{"session_\L$1"} = $Vend::Session->{$1}; | ||||
"{SESSION_\U$1$2}" | ||||
/iegx; | ||||
$debug{message} = errmsg(@_); | $debug{message} = errmsg(@_); | |||
$msg = Vend::Interpolate::tag_attr_list($tpl, \%debug, 1); | $msg = Vend::Interpolate::tag_attr_list($tpl, \%debug, 1); | |||
} | } | |||
else { | else { | |||
$msg = caller() . ":debug: " . errmsg(@_); | $msg = caller() . ":debug: " . errmsg(@_); | |||
} | } | |||
if ($Global::SysLog) { | if ($Global::SysLog) { | |||
logGlobal({ level => 'debug' }, $msg); | logGlobal({ level => 'debug' }, $msg); | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 6 lines changed or added |