$PLP::ERROR = sub {
my ($text, $html) = @_;
print '<p class="error"><strong>Fatal error</strong>: '.$html."</p>\n\n";
+ warn $text;
};
BEGIN {
$header{content_type} = 'text/html; charset=utf-8';
sub stylesheet {
- my %styles = map {$_ => $_} @_;
+ my ($avail) = @_;
+ my @avail = ref $avail eq 'ARRAY' ? @{$avail} : $avail or return;
+ my %styles = map {$_ => $_} @avail;
if (defined( my $setstyle = $get{style} )) {
$style = $styles{ $setstyle };
} or warn "Unable to create style cookie: $@";
}
- $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0];
+ $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $avail[0];
- return join "\n", map { sprintf(
+ return map { sprintf(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
- ) } @_;
+ ) } @avail;
}
sub checkmodified {
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
$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};
# optional amends
push @{ $meta->{raw} }, (
'<script type="text/javascript" src="/keys.js?1.6"></script>',
) 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};
- ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet};
-
# other vars
+ my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
# leading output
<head>
<meta http-equiv="content-type" content="$header{content_type}">
<title>$meta->{title}</title>
-<meta name="description" content="$meta->{description}">
-<meta name="keywords" content="$meta->{keywords}">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="icon" type="image/png" href="/clip.png">
EOT
- print $_, "\n" for $meta->{stylesheet} || ();
- print $_, "\n" for $meta->{raw} || ();
- print qq{</head>\n\n<body id="$file">\n};
-
- # dev indicator
- my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+ say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} }) || ();
+ say sprintf '<meta name="keywords" content="%s">', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} }) || ();
+ say '<meta name="viewport" content="width=device-width, initial-scale=1">';
+ say '<link rel="icon" type="image/png" href="/clip.png">';
+ say for stylesheet($meta->{stylesheet});
+ say for map { @{$_} } $meta->{raw} || ();
+ say '<meta name="robots" content="noindex">' if $Dev;
+ say qq{</head>\n\n<body id="$file">};
+
+ # development version indicator
printf '<p style="%s">beta</p>', join('; ',
'position: fixed',
'right: 1em',