X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cb9e9afb6d730bf2799919d2a8bd4bc2ba0ad44d..737dd2857235970b598a49dc1d987c73c8a38a08:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 4c7fbb9..5f7cb25 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -27,7 +27,7 @@ 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

'; } @@ -59,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); @@ -70,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; } @@ -121,9 +121,8 @@ sub Html { push @{ $meta->{raw} }, ( '', '', - !$showkeys ? '' - : $showkeys eq 'ghost' ? '' - : (), + !$showkeys ? '' : + $showkeys eq 'ghost' ? '' : (), '', ) if $meta->{keys}; @@ -132,7 +131,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 +166,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 +180,7 @@ EOT sub showlink { my ($title, $href, $selected) = @_; return sprintf( + !$href ? '%s' : $selected ? '%s' : '%s', EscapeHTML($title), EscapeHTML($href) );