X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=d2bf318bed49a6027e68f7a696a91de1ff29de61;hp=62a4fe2607ee4fd3e17ad93dbd73cc87cf96b1be;hb=5422a844b7384c32b3532d128e15e0b50d24435b;hpb=4af9fd9c5e46eed341a535f37d54cf228303326c diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 62a4fe26..d2bf318b 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -22,10 +22,20 @@ sub _html_top ($) { my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; my $atom = $ctx->{-atom} || $upfx.'new.atom'; + my $tip = $ctx->{-html_tip} || ''; my $top = "$desc (Atom feed)"; if ($obj->search) { + my $q_val = $ctx->{-q_value_html}; + if (defined $q_val && $q_val ne '') { + $q_val = qq(\nvalue="$q_val" ); + } else { + $q_val = ''; + } + # XXX gross, for SearchView.pm + my $extra = $ctx->{-extra_form_html} || ''; $top = qq{

$top} .
-			  qq{ } .
+			  qq{ } .
+			  $extra .
 			  qq{} .
 			  q{

} } else { @@ -35,7 +45,7 @@ sub _html_top ($) { "" . PublicInbox::Hval::STYLE . - "$top"; + "". $top . $tip; } sub _html_end { @@ -44,8 +54,6 @@ sub _html_end { my $ctx = $self->{ctx}; my $obj = $ctx->{-inbox}; my $desc = ascii_html($obj->description); - my @urls = @{$obj->cloneurl}; - my %seen = map { $_ => 1 } @urls; # FIXME: cleanup my $env = $ctx->{env}; @@ -54,9 +62,15 @@ sub _html_end { "$env->{SERVER_NAME}:$env->{SERVER_PORT}"; my $http = "$scheme://$host_port".($env->{SCRIPT_NAME} || '/'); $http = URI->new($http . $obj->{name})->canonical->as_string; - $seen{$http} or unshift @urls, $http; + my %seen = ( $http => 1 ); + my @urls = ($http); + foreach my $u (@{$obj->cloneurl}) { + next if $seen{$u}; + $seen{$u} = 1; + push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; + } if (scalar(@urls) == 1) { - $urls .= " git clone --mirror $urls[0]"; + $urls .= " git clone --mirror $http"; } else { $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls);