]> Sergey Matveev's repositories - public-inbox.git/blobdiff - lib/PublicInbox/Feed.pm
remove direct CGI.pm support
[public-inbox.git] / lib / PublicInbox / Feed.pm
index bbc89f2faf0a2a2bf73da926d233e08c3b5ed38d..a5828a8e16bf9f475c1897b60f7cd4279e064c24 100644 (file)
@@ -121,12 +121,11 @@ sub emit_html_index {
 
        my $title = $feed_opts->{description} || '';
        $title = PublicInbox::Hval->new_oneline($title)->as_html;
-       my $atom_url = $feed_opts->{atomurl};
        my ($footer, $param, $last);
        my $state = { ctx => $ctx, seen => {}, anchor_idx => 0 };
        my $srch = $ctx->{srch};
 
-       my $top = "<b>$title</b> (<a\nhref=\"$atom_url\">Atom feed</a>)";
+       my $top = "<b>$title</b> (<a\nhref=\"new.atom\">Atom feed</a>)";
 
        if ($srch) {
                $top = qq{<form\naction=""><pre>$top} .
@@ -139,7 +138,7 @@ sub emit_html_index {
 
        $fh->write("<html><head><title>$title</title>" .
                   "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
-                  "href=\"$atom_url\"\ntype=\"application/atom+xml\"/>" .
+                  "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
                   PublicInbox::Hval::STYLE .
                   "</head><body>$top");
 
@@ -285,14 +284,7 @@ sub get_feedopts {
 
        my $url_base;
        if ($cgi) {
-               my $base;
-               if (ref($cgi) eq 'CGI') {
-                       $base = $cgi->url(-base);
-               } else { # Plack::Request
-                       $base = $cgi->base->as_string;
-                       $base =~ s!/\z!!;
-               }
-               $url_base = "$base/$listname";
+               $url_base = $cgi->base->as_string . $listname;
                if (my $mid = $ctx->{mid}) { # per-thread feed:
                        $rv{atomurl} = "$url_base/$mid/t.atom";
                } else {