use HTTP::Date;
use Encode qw( decode_utf8 );
-$PLP::ERROR = sub {
- my ($text, $html) = @_;
- print '<p class="error"><strong>Fatal error</strong>: '.$html."</p>\n\n";
- warn $text;
-};
+sub Alert {
+ my ($html, $debug) = @_;
+ ref $html eq 'ARRAY' or $html = [$html];
+ my ($title, @lines) = @{$html};
+ $body = "<h2>$title</h2>";
+ $body .= "\n<p>$_</p>" for @lines;
+ $body .= "\n<pre>$debug</pre>" if $Dev and $debug;
+ say "<div class=error>$body</div>\n";
+}
BEGIN {
require Time::HiRes;
- our $Time = [Time::HiRes::gettimeofday];
+ our $Time = [Time::HiRes::gettimeofday()];
+
+ $PLP::ERROR = sub {
+ my ($text, $html) = @_;
+ warn $text;
+ unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm$}) {
+ Html({nocache => 1});
+ say '<h1>Page unavailable</h1>';
+ }
+ Alert("<strong>Fatal error</strong>: $html.");
+ };
+
+ # user request
+ our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+ our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
}
-# user request
-our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
-our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
our $style;
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.10", $_
) } @avail;
}
sub Html {
my ($meta) = @_;
- # announce and check data modification
- checkmodified(
- $ENV{SCRIPT_FILENAME},
- (grep { /\bShiar_/ } values %INC),
- $meta->{data} ? @{ $meta->{data} } : (),
- );
- $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+ unless ($meta->{nocache}) {
+ # announce and check data modification
+ checkmodified(
+ $ENV{SCRIPT_FILENAME},
+ (grep { /\bShiar_/ } values %INC),
+ $meta->{data} ? @{ $meta->{data} } : (),
+ );
+ $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
ref $_ eq 'ARRAY' or $_ = [$_]
for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
+ # document headers before output
+ $header{content_type} = "text/html; charset=$meta->{charset}"
+ unless $PLP::sentheaders;
+ unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+
+ push @{ $meta->{raw} }, (
+ '<link rel="stylesheet" type="text/css" media="monochrome" href="/mono.css?1.10" 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
- $header{content_type} = "text/html; charset=$meta->{charset}";
say '<!DOCTYPE html>';
say '<html lang="en">';
say '';
say '<head>';
- say sprintf '<meta http-equiv="content-type" content="%s">', $header{content_type};
+ 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} }) || ();
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 stylesheet($meta->{stylesheet});
say for map { @{$_} } $meta->{raw} || ();
say '<meta name="robots" content="noindex">' if $Dev;
say '</head>';
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;
+ say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '</p>';
say '';
say '</html>';
};
}
+sub showlink {
+ my ($title, $href, $selected) = @_;
+ return sprintf(
+ !$href ? '%s' :
+ $selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
+ EscapeHTML($title), EscapeHTML($href)
+ );
+}
+