X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ff4a38aff3e2d22ef34e33cd5df7a16d8ceeb196..d22e7febda8720bc38069f7061adb43b98143c48:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index d7e2b79..e3316fc 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -27,13 +27,20 @@ BEGIN { $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."); }; + + push @INC, '.'; + + # 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 +61,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 +72,7 @@ sub stylesheet { return map { sprintf( '', - $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_ + $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.11", $_ ) } @avail; } @@ -89,16 +96,18 @@ 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']; + $meta->{stylesheet} ||= [qw( light dark circus mono red )]; $meta->{charset} ||= 'utf-8'; # convert options to arrays @@ -106,17 +115,21 @@ sub Html { for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords}; # document headers before output - $header{content_type} = "text/html; charset=$meta->{charset}"; + $header{content_type} = "text/html; charset=$meta->{charset}" + unless $PLP::sentheaders; unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet}); + push @{ $meta->{raw} }, ( + '', + ); + # optional amends push @{ $meta->{raw} }, ( '', '', - !$showkeys ? '' - : $showkeys eq 'ghost' ? '' - : (), - '', + !$showkeys ? '' : + $showkeys eq 'ghost' ? '' : (), + '', ) if $meta->{keys}; # leading output @@ -124,7 +137,8 @@ sub Html { 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} }) || (); @@ -158,8 +172,9 @@ sub Html { version $meta->{version} created by • - AGPLv3 + AGPLv3 EOT say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time; say '

'; @@ -171,6 +186,7 @@ EOT sub showlink { my ($title, $href, $selected) = @_; return sprintf( + !$href ? '%s' : $selected ? '%s' : '%s', EscapeHTML($title), EscapeHTML($href) );