===================================================================
RCS file: /home/cvs/CVSROOT/Attic/cvsweb.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- CVSROOT/Attic/cvsweb.cgi	1999/12/27 20:23:26	1.2
+++ CVSROOT/Attic/cvsweb.cgi	2000/07/11 08:20:53	1.3
@@ -7,6 +7,7 @@
 # extended by Henner Zeller    <zeller@think.de>,
 #             Henrik Nordström <hno@hem.passagen.se> 
 #             Ken Coar         <coar@Apache.Org>
+#             Dick Balaska     <dick@buckosoft.com>
 #
 # Based on:
 # * Bill Fenners cvsweb.cgi revision 1.28 available from:
@@ -38,7 +39,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: cvsweb.cgi,v 1.2 1999/12/27 20:23:26 maekawa Exp $
+# $Id: cvsweb.cgi,v 1.3 2000/07/11 08:20:53 maekawa Exp $
 #
 ###
 
@@ -67,8 +68,9 @@ use vars qw (
     $extern_window_width $extern_window_height $edit_option_form
     $checkout_magic $show_subdir_lastmod $show_log_in_markup $v
     $navigationHeaderColor $tableBorderColor $markupLogColor
-    $tabstop $state $annTable $sel $curbranch $HideModules @HideModules
-    $module
+    $tabstop $state $annTable $sel $curbranch @HideModules
+    $module $use_descriptions %descriptions @mytz $dwhere $moddate
+    $use_moddate
 );
 
 ##### Start of Configuration Area ########
@@ -98,7 +100,7 @@ $allow_markup = $use_java_script = $open_extern_window
 $extern_window_width = $extern_window_height = $edit_option_form =
 $checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
 $navigationHeaderColor = $tableBorderColor = $markupLogColor = 
-$tabstop = undef;
+$tabstop = $use_moddate = $moddate = undef;
 
 ##### End of configuration variables #####
 
@@ -150,7 +152,6 @@ $maycompress =(($ENV{'HTTP_ACCEPT_ENCODING'} =~ m|gzip
 
 if (-f $config) {
     do "$config";
-    $HideModules = "§" . join("§", @HideModules) . "§";
 }
 else {
    &fatal("500 Internal Error",
@@ -204,7 +205,7 @@ foreach (@stickyvars) {
     # construct a query string with the sticky non default parameters set
     if (defined($input{$_}) && $input{$_} ne "" && $input{$_} ne $DEFAULTVALUE{$_}) { 
 	if ($barequery) {
-	    $barequery = $barequery . "&";
+	    $barequery = $barequery . "&amp;";
 	}
 	my $thisval = urlencode($_) . "=" . urlencode($input{$_});
 	$barequery .= $thisval;
@@ -213,7 +214,7 @@ foreach (@stickyvars) {
 # is there any query ?
 if ($barequery) {
     $query = "?$barequery";
-    $barequery = "&" . $barequery;
+    $barequery = "&amp;" . $barequery;
 }
 else {
     $query = "";
@@ -346,8 +347,17 @@ elsif (-d $fullname) {
 	    html_header("$where");
 	    print $short_instruction;
 	}
-	
-	print "<P><a name=\"dirlist\">\n";
+
+	my $descriptions;
+	if (($use_descriptions) && open (DESC, "<$cvsroot/CVSROOT/descriptions")) {
+	    while (<DESC>) {
+		chomp;
+		my ($dir,$description) = /(\S+)\s+(.*)/;
+		$descriptions{$dir} = $description;
+	    }
+	}
+
+	print "<P><a name=\"dirlist\"></a>\n";
 	# give direct access to dirs
 	if ($where eq '/') {
 	    chooseMirror();
@@ -362,7 +372,7 @@ elsif (-d $fullname) {
 	}
 	 
 
-	print "<P><HR NOSHADE>\n";
+	print "<HR NOSHADE>\n";
 	# Using <MENU> in this manner violates the HTML2.0 spec but
 	# provides the results that I want in most browsers.  Another
 	# case of layout spooging up HTML.
@@ -375,9 +385,9 @@ elsif (-d $fullname) {
 	    }
 	    print "<table  width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";
 	    $infocols++;
-	    print "<tr><th align=left bgcolor=" . (($byfile) ? 
+	    print "<tr><th align=left bgcolor=\"" . (($byfile) ? 
 						   $columnHeaderColorSorted : 
-						   $columnHeaderColorDefault) . ">";
+						   $columnHeaderColorDefault) . "\">";
 	    print "<a href=\"./" . &toggleQuery("sortby","file") .
 		"#dirlist\">" if (!$byfile);
 	    print "File";
@@ -387,18 +397,18 @@ elsif (-d $fullname) {
 	    # with revision information:
 	    if (scalar(%fileinfo)) {
 		$infocols++;
-		print "<th align=left bgcolor=" . (($byrev) ? 
+		print "<th align=left bgcolor=\"" . (($byrev) ? 
 						   $columnHeaderColorSorted : 
-						   $columnHeaderColorDefault) . ">";
+						   $columnHeaderColorDefault) . "\">";
 		print "<a href=\"./" . &toggleQuery ("sortby","rev") .
 		    "#dirlist\">" if (!$byrev);
 		print "Rev.";
 		print "</a>" if (!$byrev);
 		print "</th>";
 		$infocols++;
-		print "<th align=left bgcolor=" . (($bydate) ? 
+		print "<th align=left bgcolor=\"" . (($bydate) ? 
 						   $columnHeaderColorSorted : 
-						   $columnHeaderColorDefault) . ">";
+						   $columnHeaderColorDefault) . "\">";
 		print "<a href=\"./" . &toggleQuery ("sortby","date") .
 		    "#dirlist\">" if (!$bydate);
 		print "Age";
@@ -406,9 +416,9 @@ elsif (-d $fullname) {
 		print "</th>";
 		if ($show_author) {
 		    $infocols++;
-		    print "<th align=left bgcolor=" . (($byauthor) ? 
+		    print "<th align=left bgcolor=\"" . (($byauthor) ? 
 						   $columnHeaderColorSorted : 
-						   $columnHeaderColorDefault) . ">";
+						   $columnHeaderColorDefault) . "\">";
 		    print "<a href=\"./" . &toggleQuery ("sortby","author") .
 			    "#dirlist\">" if (!$byauthor);
 		    print "Author";
@@ -416,14 +426,19 @@ elsif (-d $fullname) {
 		    print "</th>";
 		}
 		$infocols++;
-		print "<th align=left bgcolor=" . (($bylog) ? 
+		print "<th align=left bgcolor=\"" . (($bylog) ? 
 					       $columnHeaderColorSorted : 
-					       $columnHeaderColorDefault) . ">";
+					       $columnHeaderColorDefault) . "\">";
 		print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog);
 		print "Last log entry";
 		print "</a>" if (!$bylog);
 		print "</th>";
 	    }
+	    elsif ($use_descriptions) {
+		print "<th align=left bgcolor=\"". $columnHeaderColorDefault . "\">";
+		print "Description";
+		$infocols++;
+	    }
 	    print "</tr>\n";
 	}
 	else {
@@ -498,7 +513,7 @@ elsif (-d $fullname) {
 		}
 		else {
 		    $url = urlencode($_) . '/' . $query;
-		    print "<A NAME=\"$_\">";
+		    print "<A NAME=\"$_\"></A>";
 		    if ($nofilelinks) {
 			print $diricon;
 		    }
@@ -514,7 +529,7 @@ elsif (-d $fullname) {
 		} 
 		# Show last change in dir
 		if ($filename) {
-		    print "</td><td>&nbsp</td><td>&nbsp;" if ($dirtable);
+		    print "</td><td>&nbsp;</td><td>&nbsp;" if ($dirtable);
 		    if ($date) {
 			print " <i>" . readableTime(time() - $date,0) . "</i>";
 		    }
@@ -536,14 +551,16 @@ elsif (-d $fullname) {
 		    }
 		}
 		else {
-		    # if there are any files (which require infocols), close the
-		    # row with the appropriate number of columns, so that the
-		    # vertical seperators are visible
-		    if ($dirtable && scalar(%fileinfo)) {
-			print "</td>";
+		    my ($dwhere) = ($where ne "/" ? $where : "") . $_;
+		    if ($use_descriptions && defined $descriptions{$dwhere}) {
+			print "<TD COLSPAN=" . ($infocols-1) . ">&nbsp;" if $dirtable;
+			print $descriptions{$dwhere};
+		    } elsif ($dirtable && $infocols > 1) {
+			# close the row with the appropriate number of
+			# columns, so that the vertical seperators are visible
 			my($cols) = $infocols;
 			while ($cols > 1) {
-			    print "<td>&nbsp;</td>";
+			    print "</td><td>&nbsp;";
 			    $cols--;
 			}
 		    }
@@ -568,7 +585,7 @@ elsif (-d $fullname) {
 		($rev,$date,$log,$author) = @{$fileinfo{$_}};
 		$filesfound++;
 		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
-		print "<A NAME=\"$_\">";
+		print "<A NAME=\"$_\"></A>";
 		if ($nofilelinks) {
 		    print $fileicon;
 		}
@@ -1146,23 +1163,30 @@ sub doCheckout {
     }
 
     if (defined($rev)) {
-	$revopt = "-r'$rev'";
+	$revopt = "-r$rev";
+	if ($use_moddate) {
+	    readLog($fullname,$rev);
+	    $moddate=$date{$rev};
+	}
     }
     else {
 	$revopt = "";
+	if ($use_moddate) {
+	    readLog($fullname);
+	    $moddate=$date{$symrev{HEAD}};
+	}
     }
     
-    # this may not be quoted with single quotes
-    # in windows .. but should in U*nx. there
-    # is a function which allows for quoting `evil` 
-    # characters somewhere, I know (buried in the Perl-manpage)
-    ##
     ### just for the record:
     ### 'cvs co' seems to have a bug regarding single checkout of
     ### directories/files having spaces in it;
     ### this is an issue that should be resolved on cvs's side
-    open($fh, "cvs -d'$cvsroot' co -p $revopt '$where' 2>&1 |") ||
-    	&fatal("500 Internal Error", "Couldn't co: $!");
+    #
+    # Safely for a child process to read from.
+    if (! open($fh, "-|")) { # child
+      open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
+      exec("cvs", "-d$cvsroot", "co", "-p", $revopt, $where);
+    } 
 #===================================================================
 #Checking out squid/src/ftp.c
 #RCS:  /usr/src/CVS/squid/src/ftp.c,v
@@ -1175,6 +1199,7 @@ sub doCheckout {
 	last if (/^\*\*\*\*/);
 	$revision = $1 if (/^VERS: (.*)$/);
 	$filename = $1 if (/^Checking out (.*)$/);
+	$filename =~ s/^\.\/*//;
 	$cvsheader .= $_;
     }
     if ($filename ne $where) {
@@ -1211,7 +1236,7 @@ sub cvswebMarkup {
     navigateHeader ($scriptwhere, $pathname, $filename, $revision, "view");
     print "<HR noshade>";
     print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">";
-    print "File: ", &clickablePath($where, 1), "</b>";
+    print "File: ", &clickablePath($where, 1);
     print "&nbsp;";
     &download_link(urlencode($fileurl), $revision, "(download)");
     if (!$defaultTextPlain) {
@@ -1239,7 +1264,7 @@ sub cvswebMarkup {
     else {
 	print "<PRE>";
 	foreach (@content) {
-	    print htmlify($_);
+	    print spacedHtmlText($_);
 	}
 	print "</PRE>";
     }
@@ -1259,7 +1284,7 @@ sub viewable($) {
 sub doDiff {
 	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
         my $fh = do {local(*FH);};
-	my ($rev1, $rev2, $sym1, $sym2, $difftype, $diffname, $f1, $f2);
+	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
 
 	if ($r1 =~ /([^:]+)(:(.+))?/) {
 	    $rev1 = $1;
@@ -1294,25 +1319,25 @@ sub doDiff {
 	}
 	my $human_readable = 0;
 	if ($f eq 'c') {
-	    $difftype = '-c';
+	    @difftype = qw{-c};
 	    $diffname = "Context diff";
 	}
 	elsif ($f eq 's') {
-	    $difftype = '--side-by-side --width=164';
+	    @difftype = qw{--side-by-side --width=164};
 	    $diffname = "Side by Side";
 	}
 	elsif ($f eq 'H') {
 	    $human_readable = 1;
-	    $difftype = '--unified=15';
+	    @difftype = qw{--unified=15};
 	    $diffname = "Long Human readable";
 	}
 	elsif ($f eq 'h') {
-	    $difftype = '-u';
+	    @difftype =qw{-u};
 	    $human_readable = 1;
 	    $diffname = "Human readable";
 	}
 	elsif ($f eq 'u') {
-	    $difftype = '-u';
+	    @difftype = qw{-u};
 	    $diffname = "Unidiff";
 	}
 	else {
@@ -1322,22 +1347,19 @@ sub doDiff {
 	# apply special options
 	if ($human_readable) {
 	    if ($hr_funout) {
-		$difftype = $difftype . ' -p';
+	    	push @difftype, '-p';
 	    }
 	    if ($hr_ignwhite) {
-		$difftype = $difftype . ' -w';
+	    	push @difftype, '-w';
 	    }
 	    if ($hr_ignkeysubst) {
-		$difftype = $difftype . ' -kk';
+	    	push @difftype, '-kk';
 	    }
 	}
-## cvs rdiff doesn't support '-p' and '-w' option .. sad    
-#	open($fh, "cvs -d $cvsroot rdiff $difftype " .
-#	              "-r$rev1 -r$rev2 '$where' 2>&1 |") 
-#	    || &fatal("500 Internal Error", "Couldn't cvs rdiff: $!");
-###
-	open($fh, "rcsdiff $difftype -r$rev1 -r$rev2 '$fullname' 2>&1 |") 
-	    || &fatal("500 Internal Error", "Couldn't GNU rcsdiff: $!");
+	if (! open($fh, "-|")) { # child
+		open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
+		exec("rcsdiff",@difftype,"-r$rev1","-r$rev2",$fullname);
+	}
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
@@ -1363,7 +1385,7 @@ sub doDiff {
 #--- src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17 RELENG_2_1_0
 # (bogus example, but...)
 #
-	if ($difftype eq '-u') {
+	if (grep { $_ eq '-u'} @difftype) {
 	    $f1 = '---';
 	    $f2 = '\+\+\+';
 	}
@@ -1416,15 +1438,19 @@ sub getDirLogs {
 	return;
     }
 
-    my ($filenames) = join("' '",@files);
     if ($tag) {
 	#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog..
-	open($fh, "rlog '$filenames' 2>/dev/null |")  
-	    || &fatal("500 Internal Error", "Failed to spawn GNU rlog");
+	if (! open($fh, "-|")) {
+		close(STDERR); # rlog may complain; ignore.
+		exec("rlog",@files);
+	}
     }
     else {
-	open($fh, "rlog -r '$filenames' 2>/dev/null |")  
-	    || &fatal("500 Internal Error", "Failed to spawn GNU rlog");
+    	my $kidpid = open($fh, "-|");
+	if (! $kidpid) {
+		close(STDERR); # rlog may complain; ignore.
+		exec("rlog","-r",@files);
+	}
     }
     $state = "start";
     while (<$fh>) {
@@ -1493,7 +1519,7 @@ again:
 	    $date = undef;
 	    $log = "";
 	    # Try to reconstruct the relative filename if RCS spits out a full path
-	    $filename =~ s%^$DirName/%%;
+	    $filename =~ s%^\Q$DirName\E/%%;
 	    next;
 	}
 	if ($state eq "log") {
@@ -1552,7 +1578,7 @@ again:
     }
     if ($. == 0) {
 	fatal("500 Internal Error", 
-	      "Failed to spawn GNU rlog on <em>'$filenames'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?");
+	      "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?");
     }
     close($fh);
 }
@@ -1579,9 +1605,14 @@ sub readLog {
 	undef %log;
 
 	print("Going to rlog '$fullname'\n") if ($verbose);
-	open($fh, "rlog $revision '$fullname'|") 
-	    || &fatal("500 Internal Error", "Failed to spawn rlog");
-
+	if (! open($fh, "-|")) { # child
+		if ($revision ne '') {
+			exec("rlog",$revision,$fullname);
+		}
+		else {
+			exec("rlog",$fullname);
+		}
+	}
 	while (<$fh>) {
 	    print if ($verbose);
 	    if ($symnames) {
@@ -1843,7 +1874,12 @@ sub printLog($;$) {
 	if (/^1\.1\.1\.\d+$/) {
 	    print " <i>(vendor branch)</i>";
 	}
-	print ", <i>" . scalar gmtime($date{$_}) . " UTC</i> (";
+	if (defined @mytz) {
+	    my ($est) = $mytz[(localtime($date{$_}))[8]];
+	    print ", <i>" . scalar localtime($date{$_}) . " $est</i> (";
+	} else {
+	    print ", <i>" . scalar gmtime($date{$_}) . " UTC</i> (";
+	}
 	print readableTime(time() - $date{$_},1) . " ago)";
 	print " by ";
 	print "<i>" . $author{$_} . "</i>\n";
@@ -1881,10 +1917,10 @@ sub printLog($;$) {
 	    if ($prev) {
 		$diffrev{$prev} = 1;
 		print " to previous <A HREF=\"${scriptwhere}.diff?r1=$prev";
-		print "&r2=$_" . $barequery . "\">$prev</A>\n";
+		print "&amp;r2=$_" . $barequery . "\">$prev</A>\n";
 		if (!$hr_default) { # offer a human readable version if not default
 		    print "(<A HREF=\"${scriptwhere}.diff?r1=$prev";
-		    print "&r2=$_" . $barequery . "&f=h\">colored</A>)\n";
+		    print "&amp;r2=$_" . $barequery . "&amp;f=h\">colored</A>)\n";
 		}
 	    }
 	    #
@@ -1892,10 +1928,10 @@ sub printLog($;$) {
 	    # offer a diff with the branch point.
 	    if ($revsym{$brp} && !/^1\.1\.1\.\d+$/ && !defined($diffrev{$brp})) {
 		print " to branchpoint <A HREF=\"${scriptwhere}.diff?r1=$brp";
-		print "&r2=$_" . $barequery . "\">$brp</A>\n";
+		print "&amp;r2=$_" . $barequery . "\">$brp</A>\n";
 		if (!$hr_default) { # offer a human readable version if not default
 		print "(<A HREF=\"${scriptwhere}.diff?r1=$brp";
-		print "&r2=$_" . $barequery . "&f=h\">colored</A>)\n";
+		print "&amp;r2=$_" . $barequery . "&amp;f=h\">colored</A>)\n";
 		}
 	    }
 	    #
@@ -1922,12 +1958,12 @@ sub printLog($;$) {
 		if (!defined($diffrev{$nextmain})) {
 		    $diffrev{$nextmain} = 1;
 		    print " next main <A HREF=\"${scriptwhere}.diff?r1=$nextmain";
-		    print "&r2=$_" . $barequery .
+		    print "&amp;r2=$_" . $barequery .
 			"\">$nextmain</A>\n";
 		    if (!$hr_default) { # offer a human readable version if not default
 			print "(<A HREF=\"${scriptwhere}.diff?r1=$nextmain";
-			print "&r2=$_" . $barequery .
-			    "&f=h\">colored</A>)\n";
+			print "&amp;r2=$_" . $barequery .
+			    "&amp;f=h\">colored</A>)\n";
 		    }
 		}
 	    }
@@ -1936,12 +1972,12 @@ sub printLog($;$) {
 	    if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) {
 		$diffrev{$input{"r1"}} = 1;
 		print " to selected <A HREF=\"${scriptwhere}.diff?"
-			. "r1=$input{'r1'}&r2=$_" . $barequery
+			. "r1=$input{'r1'}&amp;r2=$_" . $barequery
 			. "\">$input{'r1'}</A>\n";
 		if (!$hr_default) { # offer a human readable version if not default
 		    print "(<A HREF=\"${scriptwhere}.diff?r1=$input{'r1'}";
-		    print "&r2=$_" . $barequery .
-			"&f=h\">colored</A>)\n";
+		    print "&amp;r2=$_" . $barequery .
+			"&amp;f=h\">colored</A>)\n";
 
 		}
 	    }
@@ -1984,8 +2020,8 @@ sub doLog {
 	    printLog($revdisplayorder[$i]);
 	}
 
-	print "<A NAME=diff>\n";
         print "<HR NOSHADE>";
+	print "<A NAME=diff>\n";
 	print "This form allows you to request diff's between any two\n";
 	print "revisions of a file.  You may select a symbolic revision\n";
 	print "name using the selection box or you may type in a numeric\n";
@@ -2019,7 +2055,7 @@ sub doLog {
 	print "</FORM>\n";
 	print "<HR noshade>\n";
         if (@branchnames) {
-	    print "<A name=branch>\n";
+	    print "<A name=branch></A>\n";
 	    print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
 	    foreach (@stickyvars) {
 		next if ($_ eq "only_with_tag");
@@ -2045,9 +2081,8 @@ sub doLog {
 	    print "</SELECT>\n";
 	    print "<INPUT TYPE=SUBMIT VALUE=\"  View Branch  \">\n";
 	    print "</FORM>\n";
-	    print "</A>\n";
 	}
-	print "<A name=logsort>\n";
+	print "<A name=logsort></A>\n";
 	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
 	foreach (@stickyvars) {
 	    next if ($_ eq "only_with_tag");
@@ -2066,7 +2101,6 @@ sub doLog {
 	print "</SELECT>\n";
 	print "<INPUT TYPE=SUBMIT VALUE=\"  Sort  \">\n";
 	print "</FORM>\n";
-	print "</A>";
         print &html_footer;
 	print "</BODY></HTML>\n";
 }
@@ -2136,8 +2170,8 @@ sub human_readable_diff($){
   
   print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n";
 
-  print "<table border=0 cellspacing=0 cellpadding=0 width=100%>\n";
-  print "<tr bgcolor=#ffffff>\n";
+  print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n";
+  print "<tr bgcolor=\"#ffffff\">\n";
   print "<th width=\"50%\" valign=TOP>";
   print "version $rev1";
   print ", $date1" if (defined($date1));
@@ -2167,12 +2201,12 @@ sub human_readable_diff($){
       if ($difftxt =~ /^@@/) {
 	  ($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
           print  "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">";
-	  print  "<table width=100% border=1 cellpadding=5><tr><td><b>Line $oldline</b>";
+	  print  "<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $oldline</b>";
 	  print  "&nbsp;<font size=-1>$funname</font></td></tr></table>";
           print  "</td><td width=\"50%\">";
-	  print  "<table width=100% border=1 cellpadding=5><tr><td><b>Line $newline</b>";
+	  print  "<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $newline</b>";
 	  print  "&nbsp;<font size=-1>$funname</font></td></tr></table>";
-	  print  "</td><tr>\n";
+	  print  "</td>\n";
 	  $state = "dump";
 	  $leftRow = 0;
 	  $rightRow = 0;
@@ -2226,7 +2260,7 @@ sub human_readable_diff($){
   print  "</table>";
   close($fh);
 
-  print "<br><hr noshade width=100%>\n";
+  print "<br><hr noshade width=\"100%\">\n";
 
   print "<table border=0>";
 
@@ -2238,7 +2272,6 @@ sub human_readable_diff($){
   print  "<tr bgcolor=\"$diffcolorChange\"><td align=center colspan=2>changed lines</td></tr>";
   print  "<tr><td bgcolor=\"$diffcolorEmpty\">&nbsp;</td><td align=center bgcolor=\"$diffcolorAdd\">Added in v.$rev2</td></tr>";
   print  "</table></td></tr></table>\n";
-  print  "</body>\n</html>\n";
 
   print "<td>";
   # Print format selector
@@ -2262,8 +2295,9 @@ sub navigateHeader ($$$$$) {
     my ($swhere,$path,$filename,$rev,$title) = @_;
     $swhere = "" if ($swhere eq $scriptwhere);
     $swhere = urlencode($filename) if ($swhere eq "");
+    print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print '<!-- hennerik CVSweb $Revision: 1.2 $ -->';
+    print '<!-- hennerik CVSweb $Revision: 1.3 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@@ -2476,7 +2510,7 @@ sub download_url {
 	$url = "$scriptname/$checkoutMagic/${path}$url";
     }
     $url .= "?rev=$revision";
-    $url .= "&content-type=$mimetype" if (defined($mimetype));
+    $url .= "&amp;content-type=$mimetype" if (defined($mimetype));
 
     return $url;
 }
@@ -2545,7 +2579,7 @@ sub toggleQuery($$) {
 	my ($value) = defined($vars{$var}) ? $vars{$var} : "";
 	my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : "";
 	if ($value ne $default) {
-	    $newquery .= "&" if ($newquery ne "");
+	    $newquery .= "&amp;" if ($newquery ne "");
 	    $newquery .= urlencode($var) . "=" . urlencode($value);
 	}
     }
@@ -2565,6 +2599,14 @@ sub urlencode {
 sub http_header {
     my $content_type = shift || "text/html";
     my $is_mod_perl = defined($ENV{'MOD_PERL'});
+    if (defined($moddate)) {
+	if ($is_mod_perl) {
+	    Apache->request->header_out(Last_modified => scalar gmtime($moddate) . " GMT");
+	}
+	else {
+	    print "Last-Modified: " . scalar gmtime($moddate) . " GMT\n";
+	}
+    }
     if ($is_mod_perl) {
 	Apache->request->content_type($content_type);
     }
@@ -2610,13 +2652,14 @@ sub http_header {
 
 sub html_header($) {
     my ($title) = @_;
+    my $version = '$Revision: 1.3 $';
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
  "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <title>$title</title>
-<!-- hennerik CVSweb \$Revision: 1.2 $ \-->
+<!-- hennerik CVSweb $version -->
 </head>
 $body_tag
 $logo <h1 align="center">$title</h1>
@@ -2649,6 +2692,10 @@ sub link_tags
 #
 sub forbidden_module {
     my($module) = @_;
+    
+    for (my $i=0; $i < @HideModules; $i++) {
+	return 1 if $module eq $HideModules[$i];
+    }
 
-    return ("§$module§" =~ /$HideModules/);
+    return 0;
 }