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 $showkeys = !exists $get{keys} ? undef :
- ($get{keys} ne '0' && ($get{keys} || 'always'));
$header{content_type} = 'text/html; charset=utf-8';
return map { sprintf(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.11", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.18", $_
) } @avail;
}
$header{'Last-Modified'} = time2str($lastmod);
}
+sub Data {
+ my ($filename) = @_;
+ my @data = eval {
+ open my $cache, '<:raw', "data/$filename.json"
+ or return do "./$filename.inc.pl"; # silent fallback to original code
+ require JSON;
+ local $/; # slurp
+ return JSON::decode_json(readline $cache);
+ };
+ if ($@ or !@data or !$data[0]) {
+ die ['Table data not found', $@ || $!];
+ }
+ if (@data == 1 and ref $data[0] eq 'HASH' and not %{$data[0]}) {
+ die ['Table data missing'];
+ }
+ return wantarray ? @data : $data[0]; # list compatibility like do does
+}
+
sub Html {
my ($meta) = @_;
# default fallbacks
$meta->{stylesheet} ||= [qw( light dark circus mono red )];
$meta->{charset} ||= 'utf-8';
+ $meta->{lang} ||= 'en';
# convert options to arrays
ref $_ eq 'ARRAY' or $_ = [$_]
# document headers before output
$header{content_type} = "text/html; charset=$meta->{charset}"
unless $PLP::sentheaders;
+ exit if $ENV{REQUEST_METHOD} eq 'HEAD';
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> .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};
+ if (my $img = $meta->{image}) {
+ my $proto = sprintf('http%s://', !!$ENV{HTTPS} && 's');
+ my $url = "$proto$ENV{HTTP_HOST}/$img";
+ push @{ $meta->{raw} }, (
+ qq(<meta property="og:image" content="$url" />),
+ );
+ }
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
+ $meta->{canonical} //= "/$file" . ($Request ne '' && "/$Request");
+ if (my $url = $meta->{canonical}) {
+ $url = "https://sheet.shiar.nl$url";
+ push @{ $meta->{raw} }, qq(<link rel="canonical" href="$url" />);
+ }
+
PLP_START {
# leading output
say '<!DOCTYPE html>';
- say '<html lang="en">';
+ say qq(<html lang="$meta->{lang}">);
say '';
say '<head>';
say sprintf '<meta http-equiv="content-type" content="%s">', $_
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>';
}
- Alert("<strong>Fatal error</strong>: $html.");
+ Alert("Fatal error: $html.", @{$message});
};
}
sub showlink {
my ($title, $href, $selected) = @_;
- return sprintf(
- !$href ? '%s' :
- $selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
- EscapeHTML($title), EscapeHTML($href)
- );
+ EscapeHTML($title);
+ return $title if not $href;
+ return "<strong>$title</strong>" if $selected;
+ return sprintf '<a href="%s">%s</a>', EscapeHTML($href), $title;
}
git.shiar.nl / sheet.git / blobdiff