Commit 66d8c61a authored by Leigh Stoller's avatar Leigh Stoller

A bunch of awful hacks to make it more readable, and to prune out some

stuff that Jay does not want users to see.
parent 931a8a5e
......@@ -46,7 +46,7 @@
# SUCH DAMAGE.
#
# $FreeBSD: projects/cvsweb/cvsweb.cgi,v 1.119.2.6 2002/09/26 20:56:05 scop Exp $
# $Id: cvsweb.cgi,v 1.3 2005-07-07 21:36:00 stoller Exp $
# $Id: cvsweb.cgi,v 1.4 2005-09-01 18:11:43 stoller Exp $
# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $
#
###
......@@ -95,6 +95,7 @@ use vars qw (
$allow_tar @tar_options @gzip_options @zip_options @cvs_options
@annotate_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR
$tmpdir $HTML_DOCTYPE $HTML_META
$long_tag $license
);
sub printDiffSelect($);
......@@ -187,7 +188,7 @@ $cvstreedefault = $body_tag = $body_tag_for_src = $logo = $defaulttitle =
$extern_window_width = $extern_window_height = $edit_option_form =
$show_subdir_lastmod = $show_log_in_markup = $v = $navigationHeaderColor =
$tableBorderColor = $markupLogColor = $tabstop = $use_moddate = $moddate =
$gzip_open = $HTML_DOCTYPE = $HTML_META = undef;
$gzip_open = $HTML_DOCTYPE = $HTML_META = $long_tag = $license = undef;
$tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var/tmp";
$LOG_FILESEPARATOR = q/^={77}$/;
......@@ -358,6 +359,7 @@ if (defined($input{"content-type"})) {
}
if (@ARGV && $ARGV[0] eq "-repo") {
$license = undef;
@CVSrepositories = (
'top' => [$ARGV[1], $ARGV[1]],
);
......@@ -624,7 +626,7 @@ if ($input{tarball}) {
# View a directory
###############################
if (-d $fullname) {
my $dh = do { local (*DH); };
my $dh = do { local (*DH); };
opendir($dh, $fullname) or fatal("404 Not Found",
'%s: %s',
$where, $!);
......@@ -639,8 +641,10 @@ if (-d $fullname) {
$long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g;
print $long_intro;
} else {
html_header($where);
html_header($where);
print $short_instruction;
print $license
if (defined($license));
}
if ($use_descriptions && open(DESC, "<$cvsroot/CVSROOT/descriptions"))
......@@ -658,7 +662,7 @@ if (-d $fullname) {
# give direct access to dirs
if ($where eq '/') {
chooseMirror ();
chooseCVSRoot ();
#chooseCVSRoot ();
} else {
print "<p>Current directory: <b>", &clickablePath($where, 0),
"</b></p>\n";
......@@ -1102,6 +1106,10 @@ if (-d $fullname) {
print "<input type=\"submit\" value=\"Change Options\" accesskey=\"C\">";
print "</td>\n</tr>\n</table>\n</center>\n</form>\n";
}
if ($where eq '/') {
$long_tag =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g;
print $long_tag;
}
html_footer();
}
......
......@@ -9,7 +9,7 @@
# based on work by Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD: projects/cvsweb/cvsweb.conf,v 1.36.2.3 2002/09/23 05:30:17 scop Exp $
# $Id: cvsweb.conf,v 1.4 2005-02-20 15:17:37 stoller Exp $
# $Id: cvsweb.conf,v 1.5 2005-09-01 18:11:43 stoller Exp $
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.27 2001/08/01 09:48:39 knu Exp $
#
###
......@@ -198,7 +198,13 @@ diffs between that revision and the previous one, and
a form at the bottom of the page that allows you to
display diffs between arbitrary revisions.
</p>
EOT
$long_tag = <<EOT;
<br><br><br>
<hr noshade>
<p>
<font size=-1>
This script has been written by Bill Fenner and improved by Henner Zeller,
Henrik Nordstr&ouml;m, and Ken Coar, then Akinori MUSHA brought it
back to FreeBSD community and made further improvements; it is covered
......@@ -216,6 +222,7 @@ mailing list at
&lt;<a
href="mailto:freebsd-cvsweb\@FreeBSD.org">freebsd-cvsweb\@FreeBSD.org</a>&gt;.
</p>
</font>
EOT
$short_instruction = <<EOT;
......@@ -223,6 +230,9 @@ $short_instruction = <<EOT;
Click on a directory to enter that directory. Click on a file to display
its revision history and to get a chance to display diffs between revisions.
</p>
EOT
$license = <<EOT;
<p>
<b>Please remember that the Emulab
<a href="http://www.emulab.net/doc/docwrapper.php3?docname=LICENSE.txt">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment