X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=adcb5fe24314305c436e07048983c6dbaf8d9401;hb=5c8909925072804901e9c3b45bbf25446d379e7b;hp=bcf2ececc1f1dd3d54ca4c154d0d52fe5837ac76;hpb=9dfc0b670fc634b54998c3020f173b82de1915ac;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index bcf2ecec..adcb5fe2 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -7,12 +7,12 @@ # See PublicInbox::GzipFilter parent class for more info. package PublicInbox::WwwStream; use strict; +use v5.10.1; use parent qw(Exporter PublicInbox::GzipFilter); our @EXPORT_OK = qw(html_oneshot); -use bytes (); # length use PublicInbox::Hval qw(ascii_html prurl ts2str); our $TOR_URL = 'https://www.torproject.org/'; -our $CODE_URL = [ qw(http://ou63pmih66umazou.onion/public-inbox.git +our $CODE_URL = [ qw(http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/public-inbox.git https://public-inbox.org/public-inbox.git) ]; sub base_url ($) { @@ -40,8 +40,8 @@ sub html_top ($) { my $desc = ascii_html($ibx->description); my $title = delete($ctx->{-title_html}) // $desc; my $upfx = $ctx->{-upfx} || ''; - my $help = $upfx.'_/text/help'; - my $color = $upfx.'_/text/color'; + my $help = $upfx.'_/text/help/'; + my $color = $upfx.'_/text/color/'; my $atom = $ctx->{-atom} || $upfx.'new.atom'; my $top = "$desc"; if (my $t_max = $ctx->{-t_max}) { @@ -51,9 +51,10 @@ sub html_top ($) { } elsif ($ctx->{qp}->{t}) { $top = qq($top); } + my $code = $ibx->{coderepo} ? qq( / code) : ''; my $links = qq(help / ). qq(color / ). - qq(mirror / ). + qq(mirror$code / ). qq(Atom feed); if ($ibx->isrch) { my $q_val = delete($ctx->{-q_value_html}) // ''; @@ -84,16 +85,20 @@ sub coderepos ($) { my $upfx = ($ctx->{-upfx} // ''). '../'; my @ret; for my $cr_name (@$cr) { - my $urls = $cfg->{"coderepo.$cr_name.cgiturl"} // next; $ret[0] //= <code repositories for project(s) associated with this inbox: EOF - for (@$urls) { - # relative or absolute URL?, prefix relative "foo.git" - # with appropriate number of "../" - my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_; - $u = ascii_html(prurl($ctx->{env}, $u)); - $ret[0] .= qq(\n\t$u); + my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl"); + if ($urls) { + for (@$urls) { + # relative or absolute URL?, prefix relative + # "foo.git" with appropriate number of "../" + my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_; + $u = ascii_html(prurl($ctx->{env}, $u)); + $ret[0] .= qq(\n\t$u); + } + } else { + $ret[0] .= qq[\n\t$cr_name.git (no URL configured)]; } } @ret; # may be empty, this sub is called as an arg for join() @@ -211,7 +216,7 @@ sub html_oneshot ($$;$) { }; $ctx->zmore($$sref) if $sref; my $bdy = $ctx->zflush(_html_end($ctx)); - $res_hdr->[3] = bytes::length($bdy); + $res_hdr->[3] = length($bdy); [ $code, $res_hdr, [ $bdy ] ] }