X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/33e3013acbef27ba49fa091389ed8bf4096fa860..89d70c322fed012f3efda452e81437d2ee14c629:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index c6b0c84..879381d 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -8,7 +8,6 @@ use open ':std' => ':utf8';
use File::stat 'stat';
use HTTP::Date;
-use Shiar_Sheet::KeySigns qw(%sign);
$PLP::ERROR = sub {
my ($text, $html) = @_;
@@ -24,24 +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;
- if (my $cookie = CGI::Cookie->new(
- -name => 'style',
- -value => $style,
- -path => '/', # site-wide; current page is confusing to most users
- -expires => $style ? '+5y' : '-1d',
- )) {
+ 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.6", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.7", $_
) } @_;
}
@@ -90,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
@@ -99,8 +99,7 @@ sub Html {
# leading output
$header{content_type} = "text/html; charset=$meta->{charset}";
print <<"EOT";
-
+
@@ -119,11 +118,11 @@ EOT
print <<"EOT";