=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 3.9 retrieving revision 3.23 diff -u -p -r3.9 -r3.23 --- cvsweb/cvsweb.cgi 2000/07/29 12:41:25 3.9 +++ cvsweb/cvsweb.cgi 2000/09/19 19:57:58 3.23 @@ -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.101 2000/09/13 22:44:05 jumager Exp $ +# $Id: cvsweb.cgi,v 3.23 2000/09/19 19:57:58 knu Exp $ # ### @@ -53,8 +54,8 @@ use vars qw ( %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES %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 @@ -76,14 +77,61 @@ use vars qw ( $navigationHeaderColor $tableBorderColor $markupLogColor $tabstop $state $annTable $sel $curbranch @HideModules $module $use_descriptions %descriptions @mytz $dwhere $moddate - $use_moddate + $use_moddate $has_zlib $gzip_open ); +sub printDiffSelect($); +sub findLastModifiedSubdirs(@); +sub htmlify($;$); +sub spacedHtmlText($;$); +sub link($$); +sub revcmp($$); +sub fatal($$); +sub redirect($); +sub safeglob($); +sub getMimeTypeFromSuffix($); +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 http_header(;$); +sub html_header($); +sub html_footer(); +sub link_tags($); +sub forbidden_module($); + ##### Start of Configuration Area ######## -# == EDIT this == +use Cwd; + +# == EDIT this == # User configuration is stored in -$config = defined($ENV{CVSWEB_CONFIG}) ? $ENV{CVSWEB_CONFIG} : '/usr/local/etc/cvsweb.conf'; +$config = undef; +for ($ENV{CVSWEB_CONFIG}, +# '/home/knu/etc/cvsweb.conf', + '/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.. @@ -105,7 +153,7 @@ $difffontsize = $inputTextSize = $mime_types = $allow_ $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 = +$navigationHeaderColor = $tableBorderColor = $markupLogColor = $tabstop = $use_moddate = $moddate = undef; ##### End of configuration variables ##### @@ -113,6 +161,13 @@ $tabstop = $use_moddate = $moddate = undef; 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,7 +188,7 @@ $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_lynx = ($Browser =~ m`^Lynx/`i); $is_w3m = ($Browser =~ m`^w3m/`i); $is_msie = ($Browser =~ m`MSIE`); @@ -150,17 +205,16 @@ $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 = (($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); @@ -178,7 +232,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 +244,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,11 +271,11 @@ foreach (keys %DEFAULTVALUE) } } } - + $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 . "&"; @@ -300,6 +354,7 @@ foreach my $k (keys %ICONS) { do "$config-$cvstree" if (-f "$config-$cvstree"); $prcategories = '(?:' . join('|', @prcategories) . ')'; +$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; $fullname = $cvsroot . '/' . $where; $mimetype = &getMimeTypeFromSuffix ($fullname); @@ -309,9 +364,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 +445,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,8 +460,8 @@ elsif (-d $fullname) { } print "\n"; $infocols++; - print ""; $infocols++; - print ""; if ($show_author) { $infocols++; - print ""; } $infocols++; - print "
"; print "" if (!$byfile); @@ -417,8 +472,8 @@ elsif (-d $fullname) { # with revision information: if (scalar(%fileinfo)) { $infocols++; - print ""; print "" if (!$byrev); @@ -426,8 +481,8 @@ elsif (-d $fullname) { print "" if (!$byrev); print ""; print "" if (!$bydate); @@ -436,8 +491,8 @@ elsif (-d $fullname) { print ""; print "" if (!$byauthor); @@ -446,8 +501,8 @@ elsif (-d $fullname) { print ""; print "" if (!$bylog); print "Last log entry"; @@ -465,7 +520,7 @@ elsif (-d $fullname) { print "\n"; } my $dirrow = 0; - + my $i; lookingforattic: for ($i = 0; $i <= $#dir; $i++) { @@ -480,7 +535,7 @@ elsif (-d $fullname) { closedir($dh); } - my $hideAtticToggleLink = "[Hide]" if (!$input{'hideattic'}); @@ -542,11 +597,11 @@ elsif (-d $fullname) { } print " ", &link($_ . "/", $url), $attic; if ($_ eq "Attic") { - print "  [Don't hide]"; } - } + } # Show last change in dir if ($filename) { print "  " if ($dirtable); @@ -615,7 +670,7 @@ elsif (-d $fullname) { print " ", &link($_, $url), $attic; print " " if ($dirtable); download_link($fileurl, - $rev, $rev, + $rev, $rev, $defaultViewable ? "text/x-cvsweb-markup" : undef); print " " if ($dirtable); if ($date) { @@ -643,15 +698,15 @@ elsif (-d $fullname) { print "
"; } print "". ($dirtable == 1) ? "" : "" . "\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 +717,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 +728,8 @@ elsif (-d $fullname) { print ">"; print "