X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=ea7aaad0a76024ec7a04adb75a84c9b913d15810;hb=48cd028855eb40557275a7e914da5cb3f847006c;hp=8ae35c73931f19f947b0f99a076db6f832ec6e35;hpb=c2d12f79e78eb4ea909cac6106880c0f41e8c5fd;p=public-inbox.git

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 8ae35c73..ea7aaad0 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -12,7 +12,6 @@ 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 +32,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 +44,7 @@ sub _html_top ($) {
 	my $links = "<a\nhref=\"$help\">help</a> / ".
 			"<a\nhref=\"$color\">color</a> / ".
 			"<a\nhref=\"$atom\">Atom feed</a>";
-	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");
@@ -75,19 +74,19 @@ 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 +98,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(<a\nhref="$u">$u</a>) : $u;
@@ -112,19 +111,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 .=  <<EOF
 
 
 	# If you have public-inbox 1.1+ installed, you may
 	# initialize and index your mirror using the following commands:
-	public-inbox-init -V2 $obj->{name} $dir/ $http \\
+	public-inbox-init -V2 $ibx->{name} $dir/ $http \\
 		$addrs
 	public-inbox-index $dir
 EOF
 	}
-	my @nntp = map { qq(<a\nhref="$_">$_</a>) } @{$obj->nntp_url};
+	my @nntp = map { qq(<a\nhref="$_">$_</a>) } @{$ibx->nntp_url};
 	if (@nntp) {
 		$urls .= "\n\n";
 		$urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
@@ -134,10 +133,6 @@ EOF
 	if ($urls =~ m!\b[^:]+://\w+\.onion/!) {
 		$urls .= "\n note: .onion URLs require Tor: ";
 		$urls .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
-		if ($TOR2WEB_URL) {
-			$urls .= "\n       or Tor2web: ";
-			$urls .= qq[<a\nhref="$TOR2WEB_URL">$TOR2WEB_URL</a>];
-		}
 	}
 	my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
 	'<hr><pre>'.join("\n\n",