www: do not mangle characters from search queries

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index f1c4b6a052181e28c28127403a07d3732972151b..42bc648260f01f7b9259a8b16ca786660480db0e 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -145,7 +145,7 @@ sub search_nav_bot {
        my $o = $q->{o};
        my $end = $o + $nr;
        my $beg = $o + 1;
-       my $rv = '</pre><hr><pre>';
+       my $rv = '</pre><hr><pre id=t>';
        if ($beg <= $end) {
                $rv .= "Results $beg-$end of $total";
                $rv .= ' (estimated)' if $end != $total;
@@ -185,9 +185,9 @@ sub mset_thread {
                $pct{$smsg->mid} = $i->get_percent;
                $smsg;
        } ($mset->items) ]});
-
+       my $r = $q->{r};
        my $rootset = PublicInbox::SearchThread::thread($msgs,
-               $q->{r} ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts);
+               $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts);
        my $skel = search_nav_bot($mset, $q). "<pre>";
        my $inbox = $ctx->{-inbox};
        $ctx->{-upfx} = '';
@@ -203,11 +203,11 @@ sub mset_thread {
 
        PublicInbox::View::walk_thread($rootset, $ctx,
                *PublicInbox::View::pre_thread);
-
+       @$msgs = reverse @$msgs if $r;
        my $mime;
        sub {
                return unless $msgs;
-               while ($mime = shift @$msgs) {
+               while ($mime = pop @$msgs) {
                        $mime = $inbox->msg_by_smsg($mime) and last;
                }
                if ($mime) {
@@ -222,7 +222,9 @@ sub mset_thread {
 
 sub ctx_prepare {
        my ($q, $ctx) = @_;
-       my $qh = ascii_html($q->{'q'});
+       my $qh = $q->{'q'};
+       utf8::decode($qh);
+       $qh = ascii_html($qh);
        $ctx->{-q_value_html} = $qh;
        $ctx->{-atom} = '?'.$q->qs_html(x => 'A', r => undef);
        $ctx->{-title_html} = "$qh - search results";
@@ -254,8 +256,9 @@ sub adump {
 package PublicInbox::SearchQuery;
 use strict;
 use warnings;
+use URI::Escape qw(uri_escape);
 use PublicInbox::Hval;
-use PublicInbox::MID qw(mid_escape);
+use PublicInbox::MID qw(MID_ESC);
 
 sub new {
        my ($class, $qp) = @_;
@@ -280,7 +283,7 @@ sub qs_html {
                $self = $tmp;
        }
 
-       my $q = mid_escape($self->{'q'});
+       my $q = uri_escape($self->{'q'}, MID_ESC);
        $q =~ s/%20/+/g; # improve URL readability
        my $qs = "q=$q";