use warnings;
use PublicInbox::Hval qw(ascii_html);
use URI;
-use constant PI_URL => 'https://public-inbox.org/';
+our $TOR_URL = 'https://www.torproject.org/';
+our $CODE_URL = 'https://public-inbox.org/';
+our $PROJECT = 'public-inbox';
+
+sub close {}
sub new {
my ($class, $ctx, $cb) = @_;
- bless { nr => 0, cb => $cb, ctx => $ctx }, $class;
+ bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class;
}
sub response {
my $upfx = $ctx->{-upfx} || '';
my $atom = $ctx->{-atom} || $upfx.'new.atom';
my $tip = $ctx->{-html_tip} || '';
- my $top = "<b>$desc</b> (<a\nhref=\"$atom\">Atom feed</a>)";
+ my $top = "<b>$desc</b>";
+ my $links = "<a\nhref=\"$atom\">Atom feed</a>";
if ($obj->search) {
my $q_val = $ctx->{-q_value_html};
if (defined $q_val && $q_val ne '') {
- $q_val = qq(\nvalue="$q_val" );
+ $q_val = qq(\nvalue="$q_val");
} else {
$q_val = '';
}
my $extra = $ctx->{-extra_form_html} || '';
my $action = $upfx eq '' ? './' : $upfx;
$top = qq{<form\naction="$action"><pre>$top} .
- qq{ <input\nname=q\ntype=text$q_val/>} .
+ qq{\n<input\nname=q\ntype=text$q_val />} .
$extra .
qq{<input\ntype=submit\nvalue=search />} .
+ ' ' . $links .
q{</pre></form>}
} else {
- $top = '<pre>' . $top . '</pre>';
+ $top = '<pre>' . $top . "\n" . $links . '</pre>';
}
"<html><head><title>$title</title>" .
"<link\nrel=alternate\ntitle=\"Atom feed\"\n".
sub _html_end {
my ($self) = @_;
- my $urls = 'Archives are clone-able:';
+ my $urls = 'Archives are clonable:';
my $ctx = $self->{ctx};
my $obj = $ctx->{-inbox};
my $desc = ascii_html($obj->description);
- # FIXME: cleanup
- my $env = $ctx->{env};
- my $scheme = $env->{'psgi.url_scheme'};
- my $host_port = $env->{HTTP_HOST} ||
- "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
- my $http = "$scheme://$host_port".($env->{SCRIPT_NAME} || '/');
- $http = URI->new($http . $obj->{name})->canonical->as_string;
+ my $http = $obj->base_url($ctx->{env});
+ chop $http;
my %seen = ( $http => 1 );
my @urls = ($http);
+ my $need_tor;
foreach my $u (@{$obj->cloneurl}) {
next if $seen{$u};
+ $need_tor = 1 if $u =~ m!\A[^:]+://\w+\.onion/!;
$seen{$u} = 1;
push @urls, $u =~ /\Ahttps?:/ ? qq(<a\nhref="$u">$u</a>) : $u;
}
$urls .= "\n" .
join("\n", map { "\tgit clone --mirror $_" } @urls);
}
- my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL);
- '<pre>'.join("\n",
- '- ' . $desc,
+
+ if ($need_tor) {
+ $urls .= "\n note: .onion URLs require Tor: ";
+ $urls .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
+ }
+ my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
+ '<hr><pre>'.join("\n\n",
+ $desc,
$urls,
- 'Archived served using code from public-inbox:',
- "\tgit clone <a\nhref="$url">$url</a> public-inbox",
+ 'Code for this site: '.
+ qq(git clone <a\nhref="$url">$url</a> $PROJECT)
).'</pre></body></html>';
}
delete $self->{cb} ? _html_end($self) : undef;
}
-sub close {}
-
1;