=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 3.9 retrieving revision 3.39 diff -u -p -r3.9 -r3.39 --- cvsweb/cvsweb.cgi 2000/07/29 12:41:25 3.9 +++ cvsweb/cvsweb.cgi 2000/11/04 15:32:17 3.39 @@ -1,14 +1,15 @@ -#!/usr/bin/perl -ws +#!/usr/bin/perl5 -ws # # cvsweb - a CGI interface to CVS trees. # -# Written in their spare time by +# Written in their spare time by # Bill Fenner (original work) # extended by Henner Zeller , -# Henrik Nordstrom +# Henrik Nordstrom # Ken Coar # Dick Balaska # Akinori MUSHA +# Jens-Uwe Mager # # Based on: # * Bill Fenners cvsweb.cgi revision 1.28 available from: @@ -41,8 +42,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $ -# $Id: cvsweb.cgi,v 3.9 2000/07/29 12:41:25 knu Exp $ +# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ +# $Id: cvsweb.cgi,v 3.39 2000/11/04 15:32:17 knu Exp $ # ### @@ -51,20 +52,22 @@ use strict; use vars qw ( $config $allow_version_select $verbose %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES + @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted %symrev %revsym @allrevisions %date %author @revdisplayorder - @revisions %state %difflines %log %branchpoint @revorder $prcgi - @prcategories $prcategories + @revisions %state %difflines %log %branchpoint @revorder + $prcgi @prcategories $prcategories $mancgi $checkoutMagic $doCheckout $scriptname $scriptwhere $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp $is_mod_perl - $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased + $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased %input $query $barequery $sortby $bydate $byrev $byauthor - $bylog $byfile $hr_default $logsort $cvstree $cvsroot + $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot $mimetype $defaultTextPlain $defaultViewable $allow_compress $GZIPBIN $backicon $diricon $fileicon $fullname $newname - $cvstreedefault $body_tag $logo $defaulttitle $address - $backcolor $long_intro $short_instruction $shortLogLen + $cvstreedefault $body_tag $body_tag_for_src + $logo $defaulttitle $address + $long_intro $short_instruction $shortLogLen $show_author $dirtable $tablepadding $columnHeaderColorDefault $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove @@ -72,18 +75,72 @@ use vars qw ( $difffontsize $inputTextSize $mime_types $allow_annotate $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 + $show_subdir_lastmod $show_log_in_markup $v $navigationHeaderColor $tableBorderColor $markupLogColor $tabstop $state $annTable $sel $curbranch @HideModules $module $use_descriptions %descriptions @mytz $dwhere $moddate - $use_moddate + $use_moddate $has_zlib $gzip_open + $LOG_FILESEPARATOR $LOG_REVSEPARATOR ); +sub printDiffSelect($); +sub printDiffLinks($$); +sub printLogSortSelect($); +sub findLastModifiedSubdirs(@); +sub htmlify_sub(&$); +sub htmlify($;$); +sub spacedHtmlText($;$); +sub link($$); +sub revcmp($$); +sub fatal($$); +sub redirect($); +sub safeglob($); +sub getMimeTypeFromSuffix($); +sub head($;$); +sub scan_directives(@); +sub doAnnotate($$); +sub doCheckout($$); +sub cvswebMarkup($$$); +sub viewable($); +sub doDiff($$$$$$); +sub getDirLogs($$@); +sub readLog($;$); +sub printLog($;$); +sub doLog($); +sub flush_diff_rows($$$$); +sub human_readable_diff($); +sub navigateHeader($$$$$); +sub plural_write($$); +sub readableTime($$); +sub clickablePath($$); +sub chooseCVSRoot(); +sub chooseMirror(); +sub fileSortCmp(); +sub download_url($$;$); +sub download_link($$$;$); +sub toggleQuery($$); +sub urlencode($); +sub htmlquote($); +sub htmlunquote($); +sub http_header(;$); +sub html_header($); +sub html_footer(); +sub link_tags($); +sub forbidden_module($); + ##### Start of Configuration Area ######## -# == EDIT this == -# User configuration is stored in -$config = defined($ENV{CVSWEB_CONFIG}) ? $ENV{CVSWEB_CONFIG} : '/usr/local/etc/cvsweb.conf'; +use Cwd; +# == EDIT this == +# Locations to search for user configuration, in order: +for ( + $ENV{CVSWEB_CONFIG}, + '/usr/local/etc/cvsweb.conf', + getcwd() . '/cvsweb.conf' + ) { + $config = $_ if defined($_) && -r $_; +} + # == Configuration defaults == # Defaults for configuration variables that shouldn't need # to be configured.. @@ -95,8 +152,9 @@ $allow_version_select = 1; # These are defined to allow checking with perl -cw %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = %tags = %alltags = @tabcolors = (); -$cvstreedefault = $body_tag = $logo = $defaulttitle = $address = -$backcolor = $long_intro = $short_instruction = $shortLogLen = +$cvstreedefault = $body_tag = $body_tag_for_src = +$logo = $defaulttitle = $address = +$long_intro = $short_instruction = $shortLogLen = $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault = $columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite = $hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove = @@ -104,15 +162,68 @@ $diffcolorChange = $diffcolorAdd = $diffcolorDarkChang $difffontsize = $inputTextSize = $mime_types = $allow_annotate = $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 = $use_moddate = $moddate = undef; +$show_subdir_lastmod = $show_log_in_markup = $v = +$navigationHeaderColor = $tableBorderColor = $markupLogColor = +$tabstop = $use_moddate = $moddate = $gzip_open = undef; +$LOG_FILESEPARATOR = q/^={77}$/; +$LOG_REVSEPARATOR = q/^-{28}$/; + +@DIFFTYPES = qw(h H u c s); +@DIFFTYPES{@DIFFTYPES} = ( + { + 'descr' => 'colored', + 'opts' => [ '-u' ], + 'colored' => 1, + }, + { + 'descr' => 'long colored', + 'opts' => [ '--unified=15' ], + 'colored' => 1, + }, + { + 'descr' => 'unified', + 'opts' => [ '-u' ], + 'colored' => 0, + }, + { + 'descr' => 'context', + 'opts' => [ '-c' ], + 'colored' => 0, + }, + { + 'descr' => 'side by side', + 'opts' => [ '--side-by-side', '--width=164' ], + 'colored' => 0, + }, + ); + +@LOGSORTKEYS = qw(cvs date rev); +@LOGSORTKEYS{@LOGSORTKEYS} = ( + { + 'descr' => 'Not sorted', + }, + { + 'descr' => 'Commit date', + }, + { + 'descr' => 'Revision', + }, + ); + + ##### End of configuration variables ##### use Time::Local; use IPC::Open2; +# Check if the zlib C library interface is installed, and if yes +# we can avoid using the extra gzip process. +eval { + require Compress::Zlib; +}; +$has_zlib = !$@; + $verbose = $v; $checkoutMagic = "~checkout~"; $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; @@ -133,13 +244,14 @@ $is_mod_perl = defined($ENV{MOD_PERL}); # in lynx, it it very annoying to have two links # per file, so disable the link at the icon # in this case: -$Browser = $ENV{HTTP_USER_AGENT} || ''; +$Browser = $ENV{HTTP_USER_AGENT}; +$is_links = ($Browser =~ m`^Links `); $is_lynx = ($Browser =~ m`^Lynx/`i); $is_w3m = ($Browser =~ m`^w3m/`i); $is_msie = ($Browser =~ m`MSIE`); $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`); -$is_textbased = ($is_lynx || $is_w3m); +$is_textbased = ($is_links || $is_lynx || $is_w3m); $nofilelinks = $is_textbased; @@ -150,24 +262,26 @@ $nofilelinks = $is_textbased; # braindamaged MS-Internet Exploders claim that they # accept gzip .. but don't in fact and # display garbage then :-/ -# Turn off gzip if running under mod_perl. piping does -# not work as expected inside the server. One can probably -# achieve the same result using Apache::GZIPFilter. -$maycompress =(($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip` - || $is_mozilla3) - && !$is_msie - && !$is_mod_perl); +# Turn off gzip if running under mod_perl and no zlib is available, +# piping does not work as expected inside the server. +$maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) + && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`) + || $is_mozilla3) + && !$is_msie + && !($is_mod_perl && !$has_zlib)); # put here the variables we need in order # to hold our state - they will be added (with -# their current value) to any link/query string +# their current value) to any link/query string # you construct @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); if (-f $config) { - do $config; -} -else { + do $config + || &fatal("500 Internal Error", + sprintf('Error in loading configuration file: %s

%s
', + $config, &htmlify($@))); +} else { &fatal("500 Internal Error", 'Configuration not found. Set the variable $config ' . 'in cvsweb.cgi, or the environment variable ' @@ -178,7 +292,7 @@ else { undef %input; $query = $ENV{QUERY_STRING}; -if ($query ne '') { +if (defined($query) && $query ne '') { foreach (split(/&/, $query)) { s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted if (/(\S+)=(.*)/) { @@ -190,7 +304,7 @@ if ($query ne '') { } } -# For backwards compability, set only_with_tag to only_on_branch if set. +# For backwards compability, set only_with_tag to only_on_branch if set. $input{only_with_tag} = $input{only_on_branch} if (defined($input{only_on_branch})); @@ -217,27 +331,26 @@ foreach (keys %DEFAULTVALUE) } } } - + $barequery = ""; +my @barequery; foreach (@stickyvars) { # construct a query string with the sticky non default parameters set - if (defined($input{$_}) && $input{$_} ne '' && + if (defined($input{$_}) && $input{$_} ne '' && !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) { - if ($barequery) { - $barequery = $barequery . "&"; - } - my $thisval = urlencode($_) . "=" . urlencode($input{$_}); - $barequery .= $thisval; + push @barequery, join('=', urlencode($_), urlencode($input{$_})); } } # is there any query ? -if ($barequery) { +if (@barequery) { + $barequery = join('&', @barequery); $query = "?$barequery"; - $barequery = "&" . $barequery; + $barequery = "&$barequery"; } else { $query = ""; } +undef @barequery; # get actual parameters $sortby = $input{"sortby"}; @@ -262,7 +375,7 @@ else { $byfile = 1; } -$hr_default = $input{'f'} eq 'h'; +$defaultDiffType = $input{'f'}; $logsort = $input{'logsort'}; @@ -285,21 +398,33 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) $cvsroot = $CVSROOT{$cvstree}; # create icons out of description -foreach my $k (keys %ICONS) { +my $k; +foreach $k (keys %ICONS) { no strict 'refs'; my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; if ($ipath) { - ${"${k}icon"} = "\"$itxt\""; + ${"${k}icon"} = sprintf('%s', + htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) } else { ${"${k}icon"} = $itxt; } } +undef $k; +my $config_cvstree = "$config-$cvstree"; + # Do some special configuration for cvstrees -do "$config-$cvstree" if (-f "$config-$cvstree"); +if (-f $config_cvstree) { + do $config_cvstree + || &fatal("500 Internal Error", + sprintf('Error in loading configuration file: %s

%s
', + $config_cvstree, &htmlify($@))); +} +undef $config_cvstree; $prcategories = '(?:' . join('|', @prcategories) . ')'; +$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; $fullname = $cvsroot . '/' . $where; $mimetype = &getMimeTypeFromSuffix ($fullname); @@ -309,9 +434,9 @@ $defaultViewable = $allow_markup && viewable($mimetype # search for GZIP if compression allowed # We've to find out if the GZIP-binary exists .. otherwise # ge get an Internal Server Error if we try to pipe the -# output through the nonexistent gzip .. +# output through the nonexistent gzip .. # any more elegant ways to prevent this are welcome! -if ($allow_compress && $maycompress) { +if ($allow_compress && $maycompress && !$has_zlib) { foreach (split(/:/, $ENV{PATH})) { if (-x "$_/gzip") { $GZIPBIN = "$_/gzip"; @@ -390,13 +515,13 @@ elsif (-d $fullname) { $input{only_with_tag}; } - + print "
\n"; # Using 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. - + my $infocols = 0; if ($dirtable) { if (defined($tableBorderColor)) { @@ -405,57 +530,63 @@ elsif (-d $fullname) { } print "\n"; $infocols++; - print ""; # do not display the other column-headers, if we do not have any files # with revision information: if (scalar(%fileinfo)) { $infocols++; - print ""; $infocols++; - print ""; if ($show_author) { $infocols++; - print ""; } $infocols++; - print ""; } elsif ($use_descriptions) { - print "
"; - print "" if (!$byfile); - print "File"; - print "" if (!$byfile); + printf '
', + $byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($byfile) { + print 'File'; + } else { + print &link('File', sprintf('./%s#dirlist', + &toggleQuery("sortby", "file"))); + } print ""; - print "" if (!$byrev); - print "Rev."; - print "" if (!$byrev); + printf '', + $byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($byrev) { + print 'Rev.'; + } else { + print &link('Rev.', sprintf('./%s#dirlist', + &toggleQuery("sortby", "rev"))); + } print ""; - print "" if (!$bydate); - print "Age"; - print "" if (!$bydate); + printf '', + $bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($bydate) { + print 'Age'; + } else { + print &link('Age', sprintf('./%s#dirlist', + &toggleQuery("sortby", "date"))); + } print ""; - print "" if (!$byauthor); - print "Author"; - print "" if (!$byauthor); + printf '', + $byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($byauthor) { + print 'Author'; + } else { + print &link('Author', sprintf('./%s#dirlist', + &toggleQuery("sortby", "author"))); + } print ""; - print "" if (!$bylog); - print "Last log entry"; - print "" if (!$bylog); + printf '', + $bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($bylog) { + print 'Last log entry'; + } else { + print &link('Last log entry', sprintf('./%s#dirlist', + &toggleQuery("sortby", "log"))); + } print ""; + printf '', $columnHeaderColorDefault; print "Description"; $infocols++; } @@ -465,7 +596,7 @@ elsif (-d $fullname) { print "\n"; } my $dirrow = 0; - + my $i; lookingforattic: for ($i = 0; $i <= $#dir; $i++) { @@ -480,9 +611,9 @@ elsif (-d $fullname) { closedir($dh); } - my $hideAtticToggleLink = "[Hide]" if (!$input{'hideattic'}); + my $hideAtticToggleLink = $input{'hideattic'} ? '' : + &link('[Hide]', sprintf('./%s#dirlist', + &toggleQuery ("hideattic"))); # Sort without the Attic/ pathname. # place directories first @@ -520,38 +651,38 @@ elsif (-d $fullname) { next if ($_ eq '..' && $where eq '/'); my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} if (defined($fileinfo{$_})); - print "
" if ($dirtable); + printf '
', $tabcolors[$dirrow % 2] if $dirtable; if ($_ eq '..') { - $url = "../" . $query; + $url = "../$query"; if ($nofilelinks) { print $backicon; } else { - print &link($backicon,$url); + print &link($backicon, $url); } - print " ", &link("Previous Directory",$url); + print " ", &link("Previous Directory", $url); } else { - $url = urlencode($_) . '/' . $query; + $url = urlencode($_) . "/$query"; print ""; if ($nofilelinks) { print $diricon; } else { - print &link($diricon,$url); + print &link($diricon, $url); } - print " ", &link($_ . "/", $url), $attic; + print " ", &link("$_/", $url), $attic; if ($_ eq "Attic") { - print "  [Don't hide]"; + print "  "; + print &link("[Don't hide]", sprintf('./%s#dirlist', + &toggleQuery ("hideattic"))); } - } + } # Show last change in dir if ($filename) { print "  " if ($dirtable); if ($date) { - print " " . readableTime(time() - $date,0) . ""; + print " ", readableTime(time() - $date,0), ""; } if ($show_author) { print " " if ($dirtable); @@ -562,8 +693,8 @@ elsif (-d $fullname) { print "$filename/$rev"; print "
" if ($dirtable); if ($log) { - print " " - . &htmlify(substr($log,0,$shortLogLen)); + print " ", + &htmlify(substr($log,0,$shortLogLen)); if (length $log > 80) { print "..."; } @@ -573,7 +704,7 @@ elsif (-d $fullname) { else { my ($dwhere) = ($where ne "/" ? $where : "") . $_; if ($use_descriptions && defined $descriptions{$dwhere}) { - print "		 " if $dirtable; + print " " if $dirtable; print $descriptions{$dwhere}; } elsif ($dirtable && $infocols > 1) { # close the row with the appropriate number of @@ -604,7 +735,7 @@ elsif (-d $fullname) { next if (!defined($fileinfo{$_})); ($rev,$date,$log,$author) = @{$fileinfo{$_}}; $filesfound++; - print "
" if ($dirtable); + printf '
', $tabcolors[$dirrow % 2] if $dirtable; print ""; if ($nofilelinks) { print $fileicon; @@ -615,11 +746,11 @@ elsif (-d $fullname) { print " ", &link($_, $url), $attic; print " " if ($dirtable); download_link($fileurl, - $rev, $rev, - $defaultViewable ? "text/x-cvsweb-markup" : undef); + $rev, $rev, + $defaultViewable ? "text/x-cvsweb-markup" : undef); print " " if ($dirtable); if ($date) { - print " " . readableTime(time() - $date,0) . ""; + print " ", readableTime(time() - $date,0), ""; } if ($show_author) { print " " if ($dirtable); @@ -627,7 +758,7 @@ elsif (-d $fullname) { } print " " if ($dirtable); if ($log) { - print " " . &htmlify(substr($log,0,$shortLogLen)); + print " ", &htmlify(substr($log,0,$shortLogLen)); if (length $log > 80) { print "..."; } @@ -642,16 +773,16 @@ elsif (-d $fullname) { if ($dirtable && defined($tableBorderColor)) { print "
"; } - print "". ($dirtable == 1) ? "" : "" . "\n"; - + print( $dirtable == 1 ? "\n" : "\n" ); + if ($filesexists && !$filesfound) { print "

NOTE: There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n"; } if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) { %tags = %alltags } - if (scalar %tags - || $input{only_with_tag} + if (scalar %tags + || $input{only_with_tag} || $edit_option_form || defined($input{"options"})) { print "

"; @@ -662,7 +793,8 @@ elsif (-d $fullname) { foreach my $var (@stickyvars) { print "\n" if (defined($input{$var}) - && $input{$var} ne $DEFAULTVALUE{$var} + && (!defined($DEFAULTVALUE{$var}) + || $input{$var} ne $DEFAULTVALUE{$var}) && $input{$var} ne "" && $var ne "only_with_tag"); } @@ -672,8 +804,8 @@ elsif (-d $fullname) { print ">"; print "