X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ccc4981ff62e695908a9855041b9669800a733ed..9fbe7cd69afa935c523e47d026d90158b1406bc4:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index cd218ef..e5292ba 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -20,20 +20,25 @@ sub Alert { say "
$body
\n"; } -$PLP::ERROR = sub { - my ($text, $html) = @_; - Alert("Fatal error: $html."); - warn $text; -}; - 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 '

Page unavailable

'; + } + Alert("Fatal error: $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; @@ -54,7 +59,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); @@ -65,7 +70,7 @@ sub stylesheet { return map { sprintf( '', - $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_ + $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_ ) } @avail; } @@ -89,13 +94,15 @@ sub checkmodified { 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']; @@ -105,23 +112,27 @@ sub Html { 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}); + # optional amends push @{ $meta->{raw} }, ( '', '', - !$showkeys ? '' - : $showkeys eq 'ghost' ? '' - : (), + !$showkeys ? '' : + $showkeys eq 'ghost' ? '' : (), '', ) if $meta->{keys}; # leading output - $header{content_type} = "text/html; charset=$meta->{charset}"; say ''; say ''; say ''; say ''; - say sprintf '', $header{content_type}; + say sprintf '', $_ + for $header{content_type}; say sprintf '%s', $meta->{title}; say sprintf '', EscapeHTML($_) for join(' ', @{ $meta->{description} }) || (); @@ -129,7 +140,6 @@ sub Html { for join(', ', @{ $meta->{keywords} }) || (); say ''; say ''; - say for stylesheet($meta->{stylesheet}); say for map { @{$_} } $meta->{raw} || (); say '' if $Dev; say ''; @@ -156,13 +166,23 @@ sub Html { version $meta->{version} created by • - AGPLv3 + AGPLv3 EOT - say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev; + say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time; say '

'; say ''; say ''; }; } +sub showlink { + my ($title, $href, $selected) = @_; + return sprintf( + !$href ? '%s' : + $selected ? '%s' : '%s', + EscapeHTML($title), EscapeHTML($href) + ); +} +