X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=f6c504966e5b037413faf053a8777f84353d0250;hb=d87137b5a49408947eb30613e8c925d24d4f3d0b;hp=8ae35c73931f19f947b0f99a076db6f832ec6e35;hpb=65323f060a3db731bb9fafa004336eeb4bbb8f00;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 8ae35c73..f6c50496 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -10,9 +10,7 @@ package PublicInbox::WwwStream; use strict; use warnings; use PublicInbox::Hval qw(ascii_html); -use URI; our $TOR_URL = 'https://www.torproject.org/'; -our $TOR2WEB_URL = 'https://www.tor2web.org/'; our $CODE_URL = 'https://public-inbox.org/'; our $PROJECT = 'public-inbox'; @@ -33,8 +31,8 @@ sub response { sub _html_top ($) { my ($self) = @_; my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; my $help = $upfx.'_/text/help'; @@ -45,7 +43,7 @@ sub _html_top ($) { my $links = "help / ". "color / ". "Atom feed"; - if ($obj->search) { + if ($ibx->search) { my $q_val = $ctx->{-q_value_html}; if (defined $q_val && $q_val ne '') { $q_val = qq(\nvalue="$q_val"); @@ -71,23 +69,29 @@ sub _html_top ($) { "
". $top . $tip; } +sub code_footer ($) { + my ($env) = @_; + my $u = PublicInbox::Hval::prurl($env, $CODE_URL); + qq(AGPL code for this site: git clone $u $PROJECT) +} + sub _html_end { my ($self) = @_; my $urls = 'Archives are clonable:'; my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); my (%seen, @urls); - my $http = $obj->base_url($ctx->{env}); + my $http = $ibx->base_url($ctx->{env}); chop $http; # no trailing slash for clone - my $part = $obj->max_git_part; + my $part = $ibx->max_git_part; my $dir = (split(m!/!, $http))[-1]; if (defined($part)) { # v2 $seen{$http} = 1; for my $i (0..$part) { # old parts my be deleted: - -d "$obj->{mainrepo}/git/$i.git" or next; + -d "$ibx->{mainrepo}/git/$i.git" or next; my $url = "$http/$i"; $seen{$url} = 1; push @urls, "$url $dir/git/$i.git"; @@ -99,7 +103,7 @@ sub _html_end { # FIXME: partitioning in can be different in other repositories, # use the "cloneurl" file as-is for now: - foreach my $u (@{$obj->cloneurl}) { + foreach my $u (@{$ibx->cloneurl}) { next if $seen{$u}; $seen{$u} = 1; push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; @@ -112,19 +116,19 @@ sub _html_end { $urls .= " git clone --mirror $urls[0]"; } if (defined $part) { - my $addrs = $obj->{address}; + my $addrs = $ibx->{address}; $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY'; $urls .= <'.join("\n\n", $desc, $urls, - 'AGPL code for this site: '. - qq(git clone $url $PROJECT) + code_footer($ctx->{env}) ).'