X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/5ea095893fafdce2fa34e33cbc1d73ba1c65f167..3301a8a999962dee1aa9a6e6c32e3a72e8367f6c:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index d6ef393..7935a8e 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -8,10 +8,21 @@ use open ':std' => ':utf8'; use File::stat 'stat'; use HTTP::Date; +use Encode qw( decode_utf8 ); + +sub Alert { + my ($html, $debug) = @_; + ref $html eq 'ARRAY' or $html = [$html]; + my ($title, @lines) = @{$html}; + $body = "

$title

"; + $body .= "\n

$_

" for @lines; + $body .= "\n
$debug
" if $Dev and $debug; + say "
$body
\n"; +} $PLP::ERROR = sub { my ($text, $html) = @_; - print '

Fatal error: '.$html."

\n\n"; + Alert("Fatal error: $html."); warn $text; }; @@ -20,6 +31,11 @@ BEGIN { our $Time = [Time::HiRes::gettimeofday]; } +# 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; our $showkeys = !exists $get{keys} ? undef : ($get{keys} ne '0' && ($get{keys} || 'always')); @@ -54,7 +70,7 @@ sub stylesheet { } sub checkmodified { - my $lastmod; + my $lastmod = 0; for (@_) { my $mod = stat $_ or next; $mod = $mod->mtime or next; @@ -89,6 +105,10 @@ 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}"; + unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet}); + # optional amends push @{ $meta->{raw} }, ( '', @@ -99,30 +119,24 @@ sub Html { '', ) if $meta->{keys}; - # other vars - my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./; - my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x; - # leading output - $header{content_type} = "text/html; charset=$meta->{charset}"; - print <<"EOT"; - - - - - -$meta->{title} -EOT + say ''; + say ''; + say ''; + say ''; + say sprintf '', $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 stylesheet($meta->{stylesheet}); say for map { @{$_} } $meta->{raw} || (); say '' if $Dev; - say qq{\n\n}; + say ''; + say ''; + say sprintf '', $file; # development version indicator printf '

beta

', join('; ', @@ -147,10 +161,18 @@ EOT 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( + $selected ? '%s' : '%s', + EscapeHTML($title), EscapeHTML($href) + ); +} +