X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/6e999e79e078ca87e22b3474d532b3d570453661..7d90d00434f3568aa4bae2c8a7585668018c298d:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 6672bd5..7788049 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -20,6 +20,20 @@ sub Alert { say "
$body
\n"; } +sub Abort { + my ($html, $code, $debug) = @_; + unless ($PLP::sentheaders) { + $header{Status} = $code || 500; + } + elsif ($Dev) { + ref $html eq 'ARRAY' or $html = [$html]; + push @{$html}, "Also failed to set HTTP status $code" + . " after output!"; + } + Alert($html, $debug); + exit; +} + BEGIN { require Time::HiRes; our $Time = [Time::HiRes::gettimeofday()]; @@ -34,6 +48,8 @@ BEGIN { Alert("Fatal error: $html."); }; + push @INC, '.'; + # user request our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./; our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x; @@ -70,7 +86,7 @@ sub stylesheet { return map { sprintf( '', - $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_ + $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.11", $_ ) } @avail; } @@ -105,7 +121,7 @@ sub Html { } # 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,45 +133,51 @@ sub Html { unless $PLP::sentheaders; unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet}); + push @{ $meta->{raw} }, ( + '', + ); + # optional amends push @{ $meta->{raw} }, ( '', '', !$showkeys ? '' : $showkeys eq 'ghost' ? '' : (), - '', + '', ) if $meta->{keys}; - # leading output - say ''; - say ''; - say ''; - say ''; - say sprintf '', $_ - for $header{content_type}; - say sprintf '%s', $meta->{title}; - say sprintf '', EscapeHTML($_) - for join(' ', @{ $meta->{description} }) || (); - say sprintf '', EscapeHTML($_) - for join(', ', @{ $meta->{keywords} }) || (); - say ''; - say ''; - say for map { @{$_} } $meta->{raw} || (); - say '' if $Dev; - say ''; - say ''; - say sprintf '', $file; - - # development version indicator - printf '

beta

', join('; ', - 'position: fixed', - 'right: 1em', - 'opacity: .5', - 'border: 1ex solid red', - 'border-width: 1ex 0', - 'z-index: 1', - 'background: inherit', - ) if $Dev; + PLP_START { + # leading output + say ''; + say ''; + say ''; + say ''; + say sprintf '', $_ + for $header{content_type}; + say sprintf '%s', $meta->{title}; + say sprintf '', EscapeHTML($_) + for join(' ', @{ $meta->{description} }) || (); + say sprintf '', EscapeHTML($_) + for join(', ', @{ $meta->{keywords} }) || (); + say ''; + say ''; + say for map { @{$_} } $meta->{raw} || (); + say '' if $Dev; + say ''; + say ''; + say sprintf '', $file; + + # development version indicator + printf '

beta

', join('; ', + 'position: fixed', + 'right: 1em', + 'opacity: .5', + 'border: 1ex solid red', + 'border-width: 1ex 0', + 'z-index: 1', + 'background: inherit', + ) if $Dev; + }; # prepare trailing output PLP_END { @@ -168,7 +190,7 @@ sub Html { created by • AGPLv3 + rel="license">AGPLv3 EOT say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time; say '

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