--- web/cgi-bin/cvslog.cgi 2001/06/13 15:53:51 1.10 +++ web/cgi-bin/cvslog.cgi 2001/06/13 17:44:03 1.13 @@ -34,6 +34,10 @@ my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CV my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; +my ($left) = "../left.inc" ; +my ($title) = "../title.inc"; +my ($bottom) = "../bottom.inc"; + print "Content-type: text/html\n\n"; print <<"END"; @@ -47,20 +51,32 @@ print <<"END"; - + + + + + +
+END -

$heading

+&print_html($left); +print <<"END"; + 		END +&print_html($title); + +print <<"END"; +

$heading

+END + print `$updatecmd`; my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { - print ""; - print ""; + print "
$module module
\n\n"; + print "\n\n"; print "
\n$module module\n
\n"; my(@lines) = `$logcmd $module 2>&1`; @@ -71,17 +87,17 @@ foreach my $module (@modules) { foreach my $line (@lines) { if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) { - print ""; + print "\n"; print HTML_encode($1); print ""; print HTML_encode("by $2"); - print "" + print "\n" } else { chop $line; print ""; print HTML_encode($line); - print "
" + print "
\n" } } } @@ -90,8 +106,14 @@ foreach my $module (@modules) { print "

\n\n"; } +&print_html($bottom); + print <<"END"; +

+ @@ -112,4 +134,10 @@ sub HTML_encode ($){ $encoded =~ s//>/g; return $encoded; +} + +# Print a file without escaping HTML: - +sub print_html ($) { + my ($filename) = @_; + print `cat $filename 2>&1`; }