X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/560ad76852eb76efaa7ad860dc03bd9980667345..d22e7febda8720bc38069f7061adb43b98143c48:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 02821bb..e3316fc 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -27,13 +27,15 @@ BEGIN { $PLP::ERROR = sub { my ($text, $html) = @_; warn $text; - unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) { + 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; @@ -59,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); @@ -70,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; } @@ -101,11 +103,11 @@ sub Html { (grep { /\bShiar_/ } values %INC), $meta->{data} ? @{ $meta->{data} } : (), ); - $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60; + $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 @@ -117,14 +119,17 @@ sub Html { 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 @@ -132,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} }) || (); @@ -166,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 '

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