yuck. you can't use ".." in otherwise-fully-qualified URLs, so I had

to add another template variable, $dotdoturl, that is just like $baseurl
but points to one directory higher.  Sucks!
This commit is contained in:
jwz 1998-06-16 01:18:34 +00:00
parent 534a4603e7
commit 54f1974d08
3 changed files with 15 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $Id: Common.pm,v 1.5 1998/06/16 00:57:48 jwz Exp $
# $Id: Common.pm,v 1.6 1998/06/16 01:18:34 jwz Exp $
package LXR::Common;
@ -412,6 +412,13 @@ sub baseurl {
return($Conf->baseurl);
}
sub dotdoturl {
my $url = $Conf->baseurl;
$url =~ s@/$@@;
$url =~ s@/[^/]*$@@;
return($url);
}
# This one isn't too bad either. We just expand the "modes" template
# by filling in all the relevant values in the nested "modelink"
# template.
@ -581,6 +588,7 @@ sub makeheader {
('title', \&titleexpand),
('banner', \&bannerexpand),
('baseurl', \&baseurl),
('dotdoturl', \&dotdoturl),
('thisurl', \&thisurl),
('pathname', \&pathname),
('modes', \&modeexpand),

View File

@ -86,9 +86,9 @@ function js_file_menu(file,d) {
changes to<BR>this file in<BR>the last:
</TD>
<TD NOWRAP>
<A HREF="$baseurl../bonsai/cvsquery.cgi?file=mozilla$pathname&date=day">day</A><BR>
<A HREF="$baseurl../bonsai/cvsquery.cgi?file=mozilla$pathname&date=week">week</A><BR>
<A HREF="$baseurl../bonsai/cvsquery.cgi?file=mozilla$pathname&date=month">month</A><BR>
<A HREF="$dotdoturl/bonsai/cvsquery.cgi?file=mozilla$pathname&date=day">day</A><BR>
<A HREF="$dotdoturl/bonsai/cvsquery.cgi?file=mozilla$pathname&date=week">week</A><BR>
<A HREF="$dotdoturl/bonsai/cvsquery.cgi?file=mozilla$pathname&date=month">month</A><BR>
</TD>
</TR>
</TABLE>

View File

@ -86,9 +86,9 @@ function js_file_menu(file,d) {
changes to<BR>this directory<BR>in the last:
</TD>
<TD NOWRAP>
<A HREF="$baseurl../bonsai/cvsquery.cgi?file=mozilla$pathname&date=day">day</A><BR>
<A HREF="$baseurl../bonsai/cvsquery.cgi?file=mozilla$pathname&date=week">week</A><BR>
<A HREF="$baseurl../bonsai/cvsquery.cgi?file=mozilla$pathname&date=month">month</A><BR>
<A HREF="$dotdoturl/bonsai/cvsquery.cgi?file=mozilla$pathname&date=day">day</A><BR>
<A HREF="$dotdoturl/bonsai/cvsquery.cgi?file=mozilla$pathname&date=week">week</A><BR>
<A HREF="$dotdoturl/bonsai/cvsquery.cgi?file=mozilla$pathname&date=month">month</A><BR>
</TD>
</TR>
</TABLE>