X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/423d297ed8c97ba5dff7c79e48d9ee3bab609cd1..adee42e32aaccd1d94b1c6d075b4762ca0bf520c:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 1e3f30a..11f1fb4 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -8,7 +8,11 @@ use open ':std' => ':utf8'; use File::stat 'stat'; use HTTP::Date; -use Shiar_Sheet::KeySigns qw(%sign); # dependant on $get{ascii} + +$PLP::ERROR = sub { + my ($text, $html) = @_; + print '

Fatal error: '.$html."

\n\n"; +}; our $style; our $showkeys = !exists $get{keys} ? undef : @@ -19,22 +23,25 @@ $header{content_type} = 'text/html; charset=utf-8'; sub stylesheet { my %styles = map {$_ => $_} @_; - if (exists $get{style}) { - $style = $styles{ $get{style} }; - require CGI::Cookie; - AddCookie(CGI::Cookie->new( - -name => 'style', - -value => $style, - -path => '/', # site-wide; current page is confusing to most users - -expires => $style ? '+5y' : '-1d', - )->as_string); + if (defined( my $setstyle = $get{style} )) { + $style = $styles{ $setstyle }; + eval { + require CGI::Cookie; + my $cookie = CGI::Cookie->new( + -name => 'style', + -value => $setstyle || '', + -path => '/', # site-wide; current page is confusing to most users + -expires => $setstyle ? '+5y' : '-1d', + ) or die "empty object returned\n"; + AddCookie($cookie->as_string); + } or warn "Unable to create style cookie: $@"; } $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0]; return join "\n", map { sprintf( '', - $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.5", $_ + $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.7", $_ ) } @_; } @@ -70,6 +77,8 @@ sub Html { $meta->{stylesheet} ||= [qw'light dark circus mono red terse']; $meta->{charset} ||= 'utf-8'; + ref $_ eq 'ARRAY' or $_ = [$_] for $meta->{raw}; + # optional amends push @{ $meta->{raw} }, ( '', @@ -77,24 +86,22 @@ sub Html { !$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->{rawstyle}, $meta->{raw}; + ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{raw}; ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet}; # other vars - my $sep = $meta->{charset} eq 'utf-8' ? '•' : ' -- '; my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x; # leading output $header{content_type} = "text/html; charset=$meta->{charset}"; print <<"EOT"; - + @@ -102,22 +109,34 @@ sub Html { $meta->{title} + EOT print $_, "\n" for $meta->{stylesheet} || (); print $_, "\n" for $meta->{raw} || (); print qq{\n\n\n}; + # dev indicator + printf '

beta

', join('; ', + 'position: fixed', + 'right: 1em', + 'opacity: .5', + 'border: 1ex solid red', + 'border-width: 1ex 0', + 'z-index: 1', + 'background: inherit', + ) if $ENV{HTTP_HOST} =~ /\bdev\./; + # prepare trailing output PLP_END { print <<"EOT";