common: prepare stylesheet links early to fix cookies

[sheet.git] / source.plp

diff --git a/source.plp b/source.plp
index 097f0ac3f310b103b97cdd68a00fd0dfa5cef2b2..2b133712c6a0659b16da51b75ff0e564a6337df4 100644 (file)
--- a/source.plp
+++ b/source.plp
@@ -1,7 +1,6 @@
 <(common.inc.plp)><:
 
-my $source = $ENV{PATH_INFO};
-$source =~ s{^/}{};
+my $source = $Request;
 
 if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
        # convert perl include to json construct
@@ -48,7 +47,7 @@ if (not $source) {
        say '<ul>';
        for (glob '*.plp') {
                chomp;
-               say sprintf '<li><a href="/source/%s">%1$s</a></li>', EscapeHTML($_);
+               say '<li>', showlink($_, "/source/$_");
        }
        say "</ul>\n";
 }
@@ -68,7 +67,6 @@ else {
        }
        -r $source or die "Requested file not found\n";
 
-       require Encode;
        if (eval { require Text::VimColor and Text::VimColor->VERSION(0.12) }) {
                delete $Text::VimColor::SYNTAX_TYPE{Underlined};
                my %TYPETAG = (
@@ -85,23 +83,23 @@ else {
                say '<pre>';
                foreach (@$parsed) {
                        my ($type, $contents) = @{$_};
-                       $contents = Encode::decode_utf8($contents);
+                       $contents = decode_utf8($contents);
                        my $tag = $type && ($TYPETAG{$type} || 'span');
                        my $arg = '';
                        print "<$tag$arg class=\"sy-\l$type\">" if $tag;
                        if (!$type || $type eq 'Constant'
                        and $contents =~ s{^(['"]?)(/?[a-z0-9_.]+\.(?:plp?|css|js))(?=\1$)}{}) {
                                # link other page sources, stylesheets, and javascript
-                               printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
+                               print $1 . showlink($2, "/source/$2");
                        }
                        if (!$type and $contents =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
                                # link perl module names (Xx::Xx...)
-                               printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
+                               print $1 . showlink($2, "/source/$2");
                        }
                        if ($type && $type eq 'Comment'
                        and $contents =~ s{^(.*? by )(tools/\S+)}{}) {
                                # link generator scripts (by tools/...)
-                               printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
+                               print $1 . showlink($2, "/source/$2");
                        }
                        print Text::VimColor::_xml_escape($contents);
                        print "</$tag>" if $tag;
@@ -110,7 +108,7 @@ else {
        }
        else {
                say '<pre>';
-               print EscapeHTML(Encode::decode_utf8(ReadFile($source)));
+               print EscapeHTML(decode_utf8(ReadFile($source)));
                say '</pre>';
        }