X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8c3e7dc6481f4d61eca39c1250699302a329be56..v1.10-46-g4c43bcbed6:/common.inc.plp?ds=inline
diff --git a/common.inc.plp b/common.inc.plp
index 6330329..3c92817 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -8,18 +8,39 @@ use open ':std' => ':utf8';
use File::stat 'stat';
use HTTP::Date;
-
-$PLP::ERROR = sub {
- my ($text, $html) = @_;
- print '
Fatal error: '.$html."
\n\n";
- warn $text;
-};
+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";
+}
BEGIN {
require Time::HiRes;
- our $Time = [Time::HiRes::gettimeofday];
+ our $Time = [Time::HiRes::gettimeofday()];
+
+ $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.");
+ };
+
+ # 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'));
@@ -38,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);
@@ -49,12 +70,12 @@ sub stylesheet {
return map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_
) } @avail;
}
sub checkmodified {
- my $lastmod;
+ my $lastmod = 0;
for (@_) {
my $mod = stat $_ or next;
$mod = $mod->mtime or next;
@@ -73,57 +94,61 @@ 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';
- ref $_ eq 'ARRAY' or $_ = [$_] for $meta->{raw};
+ # convert options to arrays
+ ref $_ eq 'ARRAY' or $_ = [$_]
+ for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
+
+ # document headers before output
+ $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};
- # flatten arrays
- ref $_ eq 'ARRAY' and $_ = join ' ', @$_ for $meta->{description};
- ref $_ eq 'ARRAY' and $_ = join ', ', @$_ for $meta->{keywords};
- ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{raw};
-
- # 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 for stylesheet($meta->{stylesheet});
- say for $meta->{raw} || ();
+ 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 qq{\n\n};
+ say '';
+ say '';
+ say sprintf '', $file;
# development version indicator
printf 'beta
', join('; ',
@@ -145,13 +170,23 @@ EOT
version $meta->{version}
created by Shiar â¢
- AGPLv3
+ 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(
+ !$href ? '%s' :
+ $selected ? '%s' : '%s',
+ EscapeHTML($title), EscapeHTML($href)
+ );
+}
+