X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8b237b43167a2443b69b6c0a3aec13c926782fc1..15d29dfd5e43a74aab0fc7348e4a137f1f11b2a8:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 21cbc0d..f6cd6a6 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); + +$PLP::ERROR = sub { + my ($text, $html) = @_; + print '

Fatal error: '.$html."

\n\n"; +}; our $style; our $showkeys = !exists $get{keys} ? undef : @@ -19,15 +23,18 @@ $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]; @@ -83,7 +90,7 @@ sub Html { # 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 @@ -92,8 +99,7 @@ sub Html { # leading output $header{content_type} = "text/html; charset=$meta->{charset}"; print <<"EOT"; - + @@ -112,11 +118,11 @@ EOT print <<"EOT";