X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dc6b482b5e7e1d3d35b5193fc820c5e1afc29a6e..cf5aaee63c5aa7eeae7e2e136e58e156841616a9:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index b1cf2d1..7788049 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -20,6 +20,20 @@ sub Alert {
say "$body
\n";
}
+sub Abort {
+ my ($html, $code, $debug) = @_;
+ unless ($PLP::sentheaders) {
+ $header{Status} = $code || 500;
+ }
+ elsif ($Dev) {
+ ref $html eq 'ARRAY' or $html = [$html];
+ push @{$html}, "Also failed to set HTTP status $code
"
+ . " after output!";
+ }
+ Alert($html, $debug);
+ exit;
+}
+
BEGIN {
require Time::HiRes;
our $Time = [Time::HiRes::gettimeofday()];
@@ -27,13 +41,15 @@ BEGIN {
$PLP::ERROR = sub {
my ($text, $html) = @_;
warn $text;
- unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) {
+ unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm$}) {
Html({nocache => 1});
say 'Page unavailable
';
}
Alert("Fatal error: $html.");
};
+ push @INC, '.';
+
# user request
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
@@ -59,7 +75,7 @@ sub stylesheet {
my $cookie = CGI::Cookie->new(
-name => 'style',
-value => $setstyle || '',
- -path => '/', # site-wide; current page is confusing to most users
+ -path => '/', # site-wide
-expires => $setstyle ? '+5y' : '-1d',
) or die "empty object returned\n";
AddCookie($cookie->as_string);
@@ -70,7 +86,7 @@ sub stylesheet {
return map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.11", $_
) } @avail;
}
@@ -105,7 +121,7 @@ sub Html {
}
# default fallbacks
- $meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
+ $meta->{stylesheet} ||= [qw( light dark circus mono red )];
$meta->{charset} ||= 'utf-8';
# convert options to arrays
@@ -117,45 +133,51 @@ sub Html {
unless $PLP::sentheaders;
unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+ push @{ $meta->{raw} }, (
+ '',
+ );
+
# optional amends
push @{ $meta->{raw} }, (
'',
'',
- !$showkeys ? ''
- : $showkeys eq 'ghost' ? ''
- : (),
- '',
+ !$showkeys ? '' :
+ $showkeys eq 'ghost' ? '' : (),
+ '',
) if $meta->{keys};
- # leading output
- say '';
- say '';
- say '';
- say '';
- say sprintf '', $header{content_type};
- say sprintf '%s', $meta->{title};
- say sprintf '', EscapeHTML($_)
- for join(' ', @{ $meta->{description} }) || ();
- say sprintf '', EscapeHTML($_)
- for join(', ', @{ $meta->{keywords} }) || ();
- say '';
- say '';
- say for map { @{$_} } $meta->{raw} || ();
- say '' if $Dev;
- say '';
- say '';
- say sprintf '', $file;
-
- # development version indicator
- printf 'beta
', join('; ',
- 'position: fixed',
- 'right: 1em',
- 'opacity: .5',
- 'border: 1ex solid red',
- 'border-width: 1ex 0',
- 'z-index: 1',
- 'background: inherit',
- ) if $Dev;
+ PLP_START {
+ # leading output
+ say '';
+ say '';
+ say '';
+ say '';
+ say sprintf '', $_
+ for $header{content_type};
+ say sprintf '%s', $meta->{title};
+ say sprintf '', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} }) || ();
+ say sprintf '', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} }) || ();
+ say '';
+ say '';
+ say for map { @{$_} } $meta->{raw} || ();
+ say '' if $Dev;
+ say '';
+ say '';
+ say sprintf '', $file;
+
+ # development version indicator
+ printf 'beta
', join('; ',
+ 'position: fixed',
+ 'right: 1em',
+ 'opacity: .5',
+ 'border: 1ex solid red',
+ 'border-width: 1ex 0',
+ 'z-index: 1',
+ 'background: inherit',
+ ) if $Dev;
+ };
# prepare trailing output
PLP_END {
@@ -166,8 +188,9 @@ sub Html {
version $meta->{version}
created by Shiar â¢
- AGPLv3
+ AGPLv3
EOT
say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '';
@@ -179,6 +202,7 @@ EOT
sub showlink {
my ($title, $href, $selected) = @_;
return sprintf(
+ !$href ? '%s' :
$selected ? '%s' : '%s',
EscapeHTML($title), EscapeHTML($href)
);