]> Sergey Matveev's repositories - public-inbox.git/commitdiff
cgi: support /all.html page with inline threads
authorEric Wong <e@80x24.org>
Tue, 15 Apr 2014 06:51:41 +0000 (06:51 +0000)
committerEric Wong <e@80x24.org>
Tue, 15 Apr 2014 06:51:41 +0000 (06:51 +0000)
Maybe this increases readability for now.

lib/PublicInbox/Feed.pm
public-inbox.cgi

index 92bbf92d65a5134fbb0cab731d00e8fbacb6da86..1c2056312f9c13a342f3a936a7b274bb576468b6 100644 (file)
@@ -121,8 +121,9 @@ sub get_feedopts {
                my $cgi_url = $cgi->url(-path=>1, -query=>1, -relative=>1);
                my $base = $cgi->url(-base);
                $url_base = $cgi_url;
-               if ($url_base =~ s!/(?:|index\.html)?\z!!) {
-                       $rv{atomurl} = "$base$url_base/index.atom.xml";
+               if ($url_base =~ s!/(?:|(index|all)\.html)?\z!!) {
+                       my $ia = $1 || 'index';
+                       $rv{atomurl} = "$base$url_base/$ia.atom.xml";
                } else {
                        $url_base =~ s!/?(?:index|all)\.atom\.xml\z!!;
                        $rv{atomurl} = $base . $cgi_url;
index 17eb5b7beb4e0626c7bf6e135f5587cbce0d48a5..374b03d4374cfa6cc058d3b215c22405342767b6 100755 (executable)
@@ -64,6 +64,8 @@ sub main {
                r404();
        } elsif ($path_info =~ m!$LISTNAME_RE/(?:index\.html)?\z!o) {
                invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 1);
+       } elsif ($path_info =~ m!$LISTNAME_RE/(?:all\.html)?\z!o) {
+               invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0);
        } elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) {
                invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1);
        } elsif ($path_info =~ m!$LISTNAME_RE/all\.atom\.xml\z!o) {