say "<div class=error>$body</div>\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 <q>$code</q>"
+ . " after output!";
+ }
+ Alert($html, $debug);
+ exit;
+}
+
BEGIN {
require Time::HiRes;
our $Time = [Time::HiRes::gettimeofday()];
$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 '<h1>Page unavailable</h1>';
}
Alert("<strong>Fatal error</strong>: $html.");
};
+ push @INC, '.';
+
# user request
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
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);
return map { sprintf(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.11", $_
) } @avail;
}
(grep { /\bShiar_/ } values %INC),
$meta->{data} ? @{ $meta->{data} } : (),
);
- $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+ $header{'Cache-Control'} = 'max-age='.(24*60*60);
}
# 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
unless $PLP::sentheaders;
unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+ push @{ $meta->{raw} }, (
+ '<link rel="stylesheet" type="text/css" media="monochrome" href="/mono.css?1.11" title="light">',
+ );
+
# optional amends
push @{ $meta->{raw} }, (
'<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </style><![endif]-->',
'<!--[if lte IE 7]><style> .help dl.legend dd {float:none} </style><![endif]-->',
- !$showkeys ? '<style type="text/css"> .no {visibility:hidden} </style>'
- : $showkeys eq 'ghost' ? '<style type="text/css"> .no, .alias {opacity:.5} </style>'
- : (),
- '<script type="text/javascript" src="/keys.js?1.6"></script>',
+ !$showkeys ? '<style> .no {visibility:hidden} </style>' :
+ $showkeys eq 'ghost' ? '<style> .no, .alias {opacity:.5} </style>' : (),
+ '<script type="text/javascript" src="/keys.js?1.6" async></script>',
) if $meta->{keys};
- # leading output
- say '<!DOCTYPE html>';
- say '<html lang="en">';
- say '';
- say '<head>';
- say sprintf '<meta http-equiv="content-type" content="%s">', $header{content_type};
- say sprintf '<title>%s</title>', $meta->{title};
- say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
- for join(' ', @{ $meta->{description} }) || ();
- say sprintf '<meta name="keywords" content="%s">', EscapeHTML($_)
- for join(', ', @{ $meta->{keywords} }) || ();
- say '<meta name="viewport" content="width=device-width, initial-scale=1">';
- say '<link rel="icon" type="image/png" href="/clip.png">';
- say for map { @{$_} } $meta->{raw} || ();
- say '<meta name="robots" content="noindex">' if $Dev;
- say '</head>';
- say '';
- say sprintf '<body id="%s">', $file;
-
- # development version indicator
- printf '<p style="%s">beta</p>', 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 '<!DOCTYPE html>';
+ say '<html lang="en">';
+ say '';
+ say '<head>';
+ say sprintf '<meta http-equiv="content-type" content="%s">', $_
+ for $header{content_type};
+ say sprintf '<title>%s</title>', $meta->{title};
+ say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} }) || ();
+ say sprintf '<meta name="keywords" content="%s">', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} }) || ();
+ say '<meta name="viewport" content="width=device-width, initial-scale=1">';
+ say '<link rel="icon" type="image/png" href="/clip.png">';
+ say for map { @{$_} } $meta->{raw} || ();
+ say '<meta name="robots" content="noindex">' if $Dev;
+ say '</head>';
+ say '';
+ say sprintf '<body id="%s">', $file;
+
+ # development version indicator
+ printf '<p style="%s">beta</p>', 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 {
version <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
rel="vcs-git" title="Git repository">$meta->{version}</a>
created by <a href="http://shiar.nl/" rel="author">Shiar</a> •
- <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="license copyright"
- title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
+ <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html"
+ title="Licensed under the GNU Affero General Public License, version 3"
+ rel="license">AGPLv3</a>
EOT
say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '</p>';
sub showlink {
my ($title, $href, $selected) = @_;
return sprintf(
+ !$href ? '%s' :
$selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
EscapeHTML($title), EscapeHTML($href)
);