From: Eric Wong <e@80x24.org>
Date: Tue, 22 Dec 2020 05:04:16 +0000 (+0000)
Subject: wwwstream: show relative coderepo URLs correctly
X-Git-Tag: v1.7.0~1514
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37526779e4c544b134af74f43d6c26569cb8e466;p=thirdparty%2Fpublic-inbox.git

wwwstream: show relative coderepo URLs correctly

Trying to link "foo.git" relative to the current URL usually
does not provide correct results, so prefix it by going
into the parent directory if an absolute (or protocol-relative)
URL is not supplied.
---

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 9ba8fa114..958251a34 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -81,13 +81,17 @@ sub coderepos ($) {
 	my ($ctx) = @_;
 	my $cr = $ctx->{ibx}->{coderepo} // return ();
 	my $cfg = $ctx->{www}->{pi_cfg};
+	my $upfx = ($ctx->{-upfx} // ''). '../';
 	my @ret;
 	for my $cr_name (@$cr) {
 		my $urls = $cfg->{"coderepo.$cr_name.cgiturl"} // next;
 		$ret[0] //= <<EOF;
 code repositories for the project(s) associated with this inbox:
 EOF
-		for my $u (@$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<a\nhref="$u">$u</a>);
 		}