git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: treat exception references as alert parameters
[sheet.git]
/
common.inc.plp
diff --git
a/common.inc.plp
b/common.inc.plp
index dd41751a5789d861a4559312e98d745a78878c36..71c5c1379f29aeb82d6d1211ec53dff69740d2cf 100644
(file)
--- a/
common.inc.plp
+++ b/
common.inc.plp
@@
-47,10
+47,10
@@
BEGIN {
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
}
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
}
-our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
+our $Request
//
= decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
our $style;
our $style;
-our $showkeys = !exists $get{keys} ? undef :
+our $showkeys
//
= !exists $get{keys} ? undef :
($get{keys} ne '0' && ($get{keys} || 'always'));
$header{content_type} = 'text/html; charset=utf-8';
($get{keys} ne '0' && ($get{keys} || 'always'));
$header{content_type} = 'text/html; charset=utf-8';
@@
-78,7
+78,7
@@
sub stylesheet {
return map { sprintf(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
return map { sprintf(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.1
2
", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.1
3
", $_
) } @avail;
}
) } @avail;
}
@@
-196,13
+196,20
@@
EOT
BEGIN {
$PLP::ERROR = sub {
BEGIN {
$PLP::ERROR = sub {
- my ($text, $html) = @_;
- warn $text;
+ my ($message, $html) = @_;
+ if (ref $message) {
+ warn join ': ', @{$message};
+ $html = shift @{$message};
+ }
+ else {
+ warn $message;
+ $message = [];
+ }
unless ($PLP::sentheaders) {
Html({nocache => 1});
say '<h1>Page unavailable</h1>';
}
unless ($PLP::sentheaders) {
Html({nocache => 1});
say '<h1>Page unavailable</h1>';
}
- Alert("
<strong>Fatal error</strong>: $html."
);
+ Alert("
Fatal error: $html.", @{$message}
);
};
}
};
}