use warnings;
no warnings 'qw'; # you know what you doing
no warnings 'uninitialized'; # save some useless checks for more legible code
-use open IO => ':utf8';
+use open ':std' => ':utf8';
-use Shiar_Sheet::KeySigns qw(%sign); # dependant on $get{ascii}
+use File::stat 'stat';
+use HTTP::Date;
+
+$PLP::ERROR = sub {
+ my ($text, $html) = @_;
+ print '<p class="error"><strong>Fatal error</strong>: '.$html."</p>\n\n";
+};
our $style;
our $showkeys = !exists $get{keys} ? undef :
sub stylesheet {
my %styles = map {$_ => $_} @_;
- if (exists $get{style}) {
- $style = $styles{ $get{style} };
- require CGI::Cookie;
- AddCookie(CGI::Cookie->new(
- -name => 'style',
- -value => $style,
- -path => '/', # site-wide; current page is confusing to most users
- -expires => $style ? '+5y' : '-1d',
- )->as_string);
+ if (defined( my $setstyle = $get{style} )) {
+ $style = $styles{ $setstyle };
+ eval {
+ require CGI::Cookie;
+ my $cookie = CGI::Cookie->new(
+ -name => 'style',
+ -value => $setstyle || '',
+ -path => '/', # site-wide; current page is confusing to most users
+ -expires => $setstyle ? '+5y' : '-1d',
+ ) or die "empty object returned\n";
+ AddCookie($cookie->as_string);
+ } or warn "Unable to create style cookie: $@";
}
$style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0];
return join "\n", map { sprintf(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.7", $_
) } @_;
}
+sub checkmodified {
+ my $lastmod;
+ for (@_) {
+ my $mod = stat $_ or next;
+ $mod = $mod->mtime or next;
+ $lastmod = $mod if $mod gt $lastmod;
+ }
+
+ for ($ENV{HTTP_IF_MODIFIED_SINCE} || ()) {
+ next if str2time($_) < $lastmod;
+ $header{status} = '304 Same old';
+ exit;
+ }
+
+ $header{'Last-Modified'} = time2str($lastmod);
+}
+
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;
+
# default fallbacks
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
$meta->{charset} ||= 'utf-8';
+ ref $_ eq 'ARRAY' or $_ = [$_] for $meta->{raw};
+
# optional amends
push @{ $meta->{raw} }, (
'<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </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"></script>',
+ '<script type="text/javascript" src="/keys.js?1.6"></script>',
) if $meta->{keys};
# flatten arrays
ref $_ eq 'ARRAY' and $_ = join ' ', @$_ for $meta->{description};
ref $_ eq 'ARRAY' and $_ = join ', ', @$_ for $meta->{keywords};
- ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{rawstyle}, $meta->{raw};
+ ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{raw};
+ ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet};
# other vars
- my $sep = $meta->{charset} eq 'utf-8' ? '•' : ' -- ';
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
# leading output
$header{content_type} = "text/html; charset=$meta->{charset}";
print <<"EOT";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
<html lang="en">
<head>
<title>$meta->{title}</title>
<meta name="description" content="$meta->{description}">
<meta name="keywords" content="$meta->{keywords}">
+<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="/clip.png">
EOT
- print stylesheet(@$_), "\n" for $meta->{stylesheet} || ();
+ print $_, "\n" for $meta->{stylesheet} || ();
print $_, "\n" for $meta->{raw} || ();
print qq{</head>\n\n<body id="$file">\n};
+ # dev 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 $ENV{HTTP_HOST} =~ /\bdev\./;
+
# prepare trailing output
PLP_END {
print <<"EOT";
<p class="footer">
- <a href="/" rel="
home">sheet.shiar.nl</a>/$file.<a href="/source/$file.plp"
- rel="code" title="Written in Perl">plp</a>
- <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
+ <a href="/" rel="
start">sheet.shiar.nl</a>/$file.<a href="/source/$file.plp"
+ rel="source" title="Written in Perl">plp</a>
+
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> $sep
- <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="copyright"
+ 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>
</p>
git.shiar.nl / sheet.git / blobdiff