X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/253c3d4686511483f04959a14a8f08372a4d8aa2..89d70c322fed012f3efda452e81437d2ee14c629:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index cb282c0..879381d 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -23,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", $_ ) } @_; } @@ -98,8 +99,7 @@ sub Html { # leading output $header{content_type} = "text/html; charset=$meta->{charset}"; print <<"EOT"; - + @@ -118,11 +118,11 @@ EOT print <<"EOT";