nntp: inline CRLF in all response lines

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

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 1bb5fbd041587cbc3931d370fcecde9519d5ff6e..79c0a8ec209ff37081086f6a301114538e7a8ef4 100644 (file)
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -11,13 +11,14 @@ use PublicInbox::GzipFilter qw(gzf_maybe);
 use PublicInbox::ConfigIter;
 use PublicInbox::WwwStream;
 use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::MID qw(mid_escape);
 
 sub ibx_entry {
        my ($ctx, $ibx, $ce) = @_;
        my $desc = ascii_html($ce->{description} //= $ibx->description);
        my $ts = fmt_ts($ce->{-modified} //= $ibx->modified);
        my ($url, $href);
-       if (defined($ibx->{url})) {
+       if (scalar(@{$ibx->{url} // []})) {
                $url = $href = ascii_html(prurl($ctx->{env}, $ibx->{url}));
        } else {
                $href = ascii_html(uri_escape_utf8($ibx->{name})) . '/';
@@ -41,7 +42,7 @@ sub list_match_i { # ConfigIter callback
                return if $section !~ m!\Apublicinbox\.([^/]+)\z!;
                my $ibx = $cfg->lookup_name($1) or return;
                if (!$ibx->{-hide}->{$ctx->hide_key} &&
-                                       grep(/$re/, @{$ibx->{url}})) {
+                                       grep(/$re/, @{$ibx->{url} // []})) {
                        $ctx->ibx_entry($ibx);
                }
        } else { # undef == "EOF"
@@ -135,6 +136,13 @@ sub response {
        my ($re, $qs) = $ctx->url_filter;
        $re // return $ctx->psgi_triple;
        if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) { # fast path
+               if ($ctx->{qp}->{a} && # "search all inboxes"
+                               $ctx->{qp}->{'q'}) {
+                       my $u = 'all/?q='.mid_escape($ctx->{qp}->{'q'});
+                       return [ 302, [ 'Location' => $u,
+                               qw(Content-Type text/plain) ],
+                               [ "Redirecting to $u\n" ] ];
+               }
                # FIXME: test this in t/
                $ALL->misc->reopen->retry_reopen(\&add_misc_ibx,
                                                $ctx, $re, $qs);
@@ -166,11 +174,10 @@ sub mset_nav_top {
        $qh = qq[\nvalue="$qh"] if $qh ne '';
        my $rv = <<EOM;
 <form
-action="./"><pre><input
-name=q
-type=text$qh /><input
-type=submit
-value="locate inbox" /></pre></form><pre>
+action="./"><pre><input name=q type=text$qh
+/><input type=submit value="locate inbox"
+/><input type=submit name=a value="search all inboxes"
+/></pre></form><pre>
 EOM
        chomp $rv;
        if (defined($q->{'q'})) {
@@ -227,7 +234,8 @@ sub psgi_triple {
                $gzf->zmore('<pre>no inboxes, yet');
        }
        my $out = $gzf->zflush('</pre><hr><pre>'.
-                       PublicInbox::WwwStream::code_footer($ctx->{env}) .
+qq(This is a listing of public inboxes, see the `mirror' link of each inbox
+for instructions on how to mirror all the data and code on this site.) .
                        '</pre></body></html>');
        $h->[3] = length($out);
        [ $code, $h, [ $out ] ];