=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.21 retrieving revision 1.1.1.22 diff -u -p -r1.1.1.21 -r1.1.1.22 --- cvsweb/cvsweb.cgi 2001/01/12 04:17:16 1.1.1.21 +++ cvsweb/cvsweb.cgi 2001/01/14 08:49:27 1.1.1.22 @@ -18,7 +18,7 @@ # Copyright (c) 1996-1998 Bill Fenner # (c) 1998-1999 Henner Zeller # (c) 1999 Henrik Nordstrom -# (c) 2000 Akinori MUSHA +# (c) 2000-2001 Akinori MUSHA # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -42,8 +42,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ -# $kId: cvsweb.cgi,v 1.63 2001/01/11 23:42:01 knu Exp $ +# $zId: cvsweb.cgi,v 1.105 2000/11/26 01:51:04 jumager Exp $ +# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $ # ### @@ -52,6 +52,7 @@ require 5.000; use strict; use vars qw ( + $cvsweb_revision $mydir $uname $config $allow_version_select $verbose @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES @@ -138,6 +139,10 @@ sub forbidden_module($); ##### Start of Configuration Area ######## delete $ENV{PATH}; +$cvsweb_revision = join('.', '1.105', (split(/ /, + q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $ +))[2]); + use File::Basename; ($mydir) = (dirname($0) =~ /(.*)/); # untaint @@ -248,7 +253,7 @@ $where =~ s|^/||; $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; $scriptname =~ s|^/*|/|; -# Let's workaround thttpd's stupidness.. +# Let's workaround thttpd's stupidity.. if ($scriptname =~ m|/$|) { $pathinfo .= '/'; my $re = quotemeta $pathinfo; @@ -733,7 +738,8 @@ if (-d $fullname) { if ($_ eq '..' || -d "$fullname/$_") { next if ($_ eq '..' && $where eq '/'); - my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} + my ($rev,$date,$log,$author,$filename); + ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} if (defined($fileinfo{$_})); printf '', $tabcolors[$dirrow % 2] if $dirtable; if ($_ eq '..') { @@ -2752,14 +2758,19 @@ sub navigateHeader($$$$$) { my ($swhere,$path,$filename,$rev,$title) = @_; $swhere = "" if ($swhere eq $scriptwhere); $swhere = urlencode($filename) if ($swhere eq ""); - print qq``; - print "\n\n"; - print qq`\n`; - print ''; - print "\n$path$filename - $title - $rev\n"; - print "$body_tag_for_src\n"; - print ""; - print "
"; + + print < + + + + +$path$filename - $title - $rev +$body_tag_for_src + +"; @@ -3150,7 +3161,6 @@ sub http_header(;$) { sub html_header($) { my ($title) = @_; - my $version = '$zRevision: 1.104 $ $kRevision: 1.63 $'; #' http_header("text/html"); print < $title - + $body_tag $logo

$title

+EOF + print &link($backicon, "$swhere$query#rev$rev"); print " Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; print " $fileicon