source: link back to resulting page

[sheet.git] / common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 6b45e50042d6bb5f5f52420198905e2f41ac53db..5f7cb25f394046b8963f5b9b85d6292ba0f0f55a 100644 (file)
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -20,20 +20,25 @@ sub Alert {
        say "<div class=error>$body</div>\n";
 }
 
-$PLP::ERROR = sub {
-       my ($text, $html) = @_;
-       Alert("<strong>Fatal error</strong>: $html.");
-       warn $text;
-};
-
 BEGIN {
        require Time::HiRes;
        our $Time = [Time::HiRes::gettimeofday()];
+
+       $PLP::ERROR = sub {
+               my ($text, $html) = @_;
+               warn $text;
+               unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm$}) {
+                       Html({nocache => 1});
+                       say '<h1>Page unavailable</h1>';
+               }
+               Alert("<strong>Fatal error</strong>: $html.");
+       };
+
+       # user request
+       our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+       our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 }
 
-# user request
-our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
-our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
 
 our $style;
@@ -54,7 +59,7 @@ sub stylesheet {
                        my $cookie = CGI::Cookie->new(
                                -name    => 'style',
                                -value   => $setstyle || '',
-                               -path    => '/',  # site-wide; current page is confusing to most users
+                               -path    => '/',  # site-wide
                                -expires => $setstyle ? '+5y' : '-1d',
                        ) or die "empty object returned\n";
                        AddCookie($cookie->as_string);
@@ -65,7 +70,7 @@ sub stylesheet {
 
        return map { sprintf(
                '<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
+               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_
        ) } @avail;
 }
 
@@ -89,13 +94,15 @@ sub checkmodified {
 sub Html {
        my ($meta) = @_;
 
-       # announce and check data modification
-       checkmodified(
-               $ENV{SCRIPT_FILENAME},
-               (grep { /\bShiar_/ } values %INC),
-               $meta->{data} ? @{ $meta->{data} } : (),
-       );
-       $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+       unless ($meta->{nocache}) {
+               # announce and check data modification
+               checkmodified(
+                       $ENV{SCRIPT_FILENAME},
+                       (grep { /\bShiar_/ } values %INC),
+                       $meta->{data} ? @{ $meta->{data} } : (),
+               );
+               $header{'Cache-Control'} = 'max-age='.(24*60*60);
+       }
 
        # default fallbacks
        $meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
@@ -106,16 +113,16 @@ sub Html {
                for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
 
        # document headers before output
-       $header{content_type} = "text/html; charset=$meta->{charset}";
+       $header{content_type} = "text/html; charset=$meta->{charset}"
+               unless $PLP::sentheaders;
        unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
 
        # optional amends
        push @{ $meta->{raw} }, (
                '<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </style><![endif]-->',
                '<!--[if lte IE 7]><style> .help dl.legend dd {float:none} </style><![endif]-->',
-               !$showkeys ? '<style type="text/css"> .no {visibility:hidden} </style>'
-                       : $showkeys eq 'ghost' ? '<style type="text/css"> .no, .alias {opacity:.5} </style>'
-                       : (),
+               !$showkeys ? '<style> .no {visibility:hidden} </style>' :
+               $showkeys eq 'ghost' ? '<style> .no, .alias {opacity:.5} </style>' : (),
                '<script type="text/javascript" src="/keys.js?1.6"></script>',
        ) if $meta->{keys};
 
@@ -124,7 +131,8 @@ sub Html {
        say '<html lang="en">';
        say '';
        say '<head>';
-       say sprintf '<meta http-equiv="content-type" content="%s">', $header{content_type};
+       say sprintf '<meta http-equiv="content-type" content="%s">', $_
+               for $header{content_type};
        say sprintf '<title>%s</title>', $meta->{title};
        say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
                for join(' ', @{ $meta->{description} }) || ();
@@ -158,8 +166,9 @@ sub Html {
        version <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
         rel="vcs-git" title="Git repository">$meta->{version}</a>
        created by <a href="http://shiar.nl/" rel="author">Shiar</a> •
-       <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="license copyright"
-        title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
+       <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html"
+        title="Licensed under the GNU Affero General Public License, version 3"
+        rel="license copyright">AGPLv3</a>
 EOT
                say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
                say '</p>';
@@ -171,6 +180,7 @@ EOT
 sub showlink {
        my ($title, $href, $selected) = @_;
        return sprintf(
+               !$href ? '%s' :
                $selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
                EscapeHTML($title), EscapeHTML($href)
        );