www: do not unecessarily escape some chars in paths

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e0d81f0029b9c1a1f5584eb6cf76578b74302f5c..34f97c7696ebbd0110ed6be75aa2210c0e63f615 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -10,7 +10,7 @@ use URI::Escape qw/uri_escape_utf8/;
 use Date::Parse qw/str2time/;
 use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::Linkify;
-use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
+use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/;
 use PublicInbox::MsgIter;
 use PublicInbox::Address;
 use PublicInbox::WwwStream;
@@ -94,7 +94,7 @@ sub in_reply_to {
        my ($hdr) = @_;
        my $irt = $hdr->header_raw('In-Reply-To');
 
-       return mid_clean($irt) if (defined $irt);
+       return mid_clean($irt) if defined $irt && $irt ne '';
 
        my $refs = $hdr->header_raw('References');
        if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
@@ -125,7 +125,6 @@ sub index_entry {
        my $mid_raw = mid_clean(mid_mime($mime));
        my $id = id_compress($mid_raw, 1);
        my $id_m = 'm'.$id;
-       my $mid = PublicInbox::Hval->new_msgid($mid_raw);
 
        my $root_anchor = $ctx->{root_anchor} || '';
        my $irt = in_reply_to($hdr);
@@ -142,7 +141,7 @@ sub index_entry {
        }
        $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
        my $upfx = $ctx->{-upfx};
-       my $mhref = $upfx . $mid->as_href . '/';
+       my $mhref = $upfx . mid_escape($mid_raw) . '/';
        $rv .= qq{ (<a\nhref="$mhref">permalink</a> / };
        $rv .= qq{<a\nhref="${mhref}raw">raw</a>)\n};
        $rv .= '  '.join('; +', @tocc) . "\n" if @tocc;
@@ -150,7 +149,7 @@ sub index_entry {
        my $mapping = $ctx->{mapping};
        if (!$mapping && $irt) {
                my $mirt = PublicInbox::Hval->new_msgid($irt);
-               my $href = $upfx . $mirt->as_href . '/';
+               my $href = $upfx . $mirt->{href}. '/';
                my $html = $mirt->as_html;
                $rv .= qq(In-Reply-To: &lt;<a\nhref="$href">$html</a>&gt;\n)
        }
@@ -164,13 +163,17 @@ sub index_entry {
                "<a\nhref=\"$mhref\">permalink</a>" .
                " <a\nhref=\"${mhref}raw\">raw</a>" .
                " <a\nhref=\"${mhref}#R\">reply</a>";
+
+       my $hr;
        if (my $pct = $ctx->{pct}) { # used by SearchView.pm
                $rv .= "\t[relevance $pct->{$mid_raw}%]";
+               $hr = 1;
        } elsif ($mapping) {
                my $threaded = 'threaded';
                my $flat = 'flat';
                my $end = '';
                if ($ctx->{flat}) {
+                       $hr = 1;
                        $flat = "<b>$flat</b>";
                } else {
                        $threaded = "<b>$threaded</b>";
@@ -178,9 +181,12 @@ sub index_entry {
                $rv .= "\t[<a\nhref=\"${mhref}T/#u\">$flat</a>";
                $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
                $rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
+       } else {
+               $hr = $ctx->{-hr};
        }
 
-       $rv .= $more ? "\n\n" : "\n";
+       $rv .= $more ? '</pre><hr><pre>' : '</pre>' if $hr;
+       $rv;
 }
 
 sub pad_link ($$;$) {
@@ -201,8 +207,8 @@ sub _th_index_lite {
        my $nr_s = 0;
        my $level = $map->[4];
        my $idx = $map->[3];
-       if (defined $irt) {
-               my $irt_map = $mapping->{$irt};
+       my $irt_map = $mapping->{$irt} if defined $irt;
+       if (defined $irt_map) {
                my $siblings = $irt_map->[0];
                $nr_s = scalar(@$siblings) - 1;
                $rv .= $pad . $irt_map->[1];
@@ -371,7 +377,7 @@ sub thread_html {
                        return index_entry($mime, $ctx, scalar @$msgs);
                }
                $msgs = undef;
-               '</pre>'.$skel;
+               $skel;
        });
 }
 
@@ -561,7 +567,7 @@ sub _parent_headers {
        if (defined $irt) {
                my $v = PublicInbox::Hval->new_msgid($irt);
                my $html = $v->as_html;
-               my $href = $v->as_href;
+               my $href = $v->{href};
                $rv .= "In-Reply-To: &lt;";
                $rv .= "<a\nhref=\"../$href/\">$html</a>&gt;\n";
        }
@@ -620,7 +626,7 @@ sub mailto_arg_link {
        $subj = "Re: $subj" unless $subj =~ /\bRe:/i;
        my $mid = $hdr->header_raw('Message-ID');
        push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
-       my $irt = uri_escape_utf8($mid);
+       my $irt = mid_escape($mid);
        delete $cc{$to};
        push @arg, "--to=$to";
        $to = uri_escape_utf8($to);
@@ -650,17 +656,17 @@ sub html_footer {
                $next = $prev = '    ';
 
                if (my $n = $ctx->{next_msg}) {
-                       $n = PublicInbox::Hval->new_msgid($n)->as_href;
+                       $n = PublicInbox::Hval->new_msgid($n)->{href};
                        $next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
                }
                my $u;
                my $par = $ctx->{parent_msg};
                if ($par) {
-                       $u = PublicInbox::Hval->new_msgid($par)->as_href;
+                       $u = PublicInbox::Hval->new_msgid($par)->{href};
                        $u = "$upfx$u/";
                }
                if (my $p = $ctx->{prev_msg}) {
-                       $prev = PublicInbox::Hval->new_msgid($p)->as_href;
+                       $prev = PublicInbox::Hval->new_msgid($p)->{href};
                        if ($p && $par && $p eq $par) {
                                $prev = "<a\nhref=\"$upfx$prev/\"\n" .
                                        'rel=prev>prev parent</a>';
@@ -685,7 +691,7 @@ sub html_footer {
 sub linkify_ref_nosrch {
        my $v = PublicInbox::Hval->new_msgid($_[0]);
        my $html = $v->as_html;
-       my $href = $v->as_href;
+       my $href = $v->{href};
        "&lt;<a\nhref=\"../$href/\">$html</a>&gt;";
 }
 
@@ -700,7 +706,7 @@ sub ghost_parent {
        return '[no common parent]' if ($mid eq 'subject dummy');
 
        $mid = PublicInbox::Hval->new_msgid($mid);
-       my $href = $mid->as_href;
+       my $href = $mid->{href};
        my $html = $mid->as_html;
        qq{[parent not found: &lt;<a\nhref="$upfx$href/">$html</a>&gt;]};
 }
@@ -786,7 +792,7 @@ sub _skel_header {
                $s = PublicInbox::Hval->new($s);
                $s = $s->as_html;
        }
-       my $m = PublicInbox::Hval->new_msgid($mid);
+       my $m;
        my $id = '';
        my $mapping = $ctx->{mapping};
        my $end = defined($s) ? "$s</a> $f\n" : "$f</a>\n";
@@ -797,7 +803,7 @@ sub _skel_header {
                $map->[1] = "$d<a\nhref=\"$m\">$end";
                $id = "\nid=r".$id;
        } else {
-               $m = $ctx->{-upfx}.$m->as_href.'/';
+               $m = $ctx->{-upfx}.mid_escape($mid).'/';
        }
        $$dst .=  $d . "<a\nhref=\"$m\"$id>" . $end;
 }
@@ -822,7 +828,7 @@ sub skel_dump {
                $d .= indent_for($level) . th_pfx($level);
                my $upfx = $ctx->{-upfx};
                my $m = PublicInbox::Hval->new_msgid($mid);
-               my $href = $upfx . $m->as_href . '/';
+               my $href = $upfx . $m->{href} . '/';
                my $html = $m->as_html;
 
                if ($map) {
@@ -904,7 +910,7 @@ sub dump_topics {
                @$topic = ();
                next unless defined $top;  # ghost topic
                my $mid = delete $seen->{$top};
-               my $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+               my $href = mid_escape($mid);
                $top = PublicInbox::Hval->new($top)->as_html;
                $ts = fmt_ts($ts);
 
@@ -928,7 +934,7 @@ sub dump_topics {
                        my $sub = $ex[$i + 1];
                        $mid = delete $seen->{$sub};
                        $sub = PublicInbox::Hval->new($sub)->as_html;
-                       $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+                       $href = mid_escape($mid);
                        $s .= indent_for($level) . TCHILD;
                        $s .= "<a\nhref=\"$href/T/#u\">$sub</a>\n";
                }