cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 1.1.1.7 and 3.30

version 1.1.1.7, 2000/09/23 20:23:34

version 3.30, 2000/09/30 20:10:01

Line 43

# SUCH DAMAGE.

# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $

# $kId: cvsweb.cgi,v 1.26 2000/09/22 11:13:17 knu Exp $

# $Id$

###

Line 125 sub forbidden_module($);

use Cwd;

# == EDIT this ==

# User configuration is stored in

# Locations to search for user configuration, in order:

$config = undef;

for (

$ENV{CVSWEB_CONFIG},

for ($ENV{CVSWEB_CONFIG},

# '/home/knu/etc/cvsweb.conf',

'/usr/local/etc/cvsweb.conf',

getcwd . '/cvsweb.conf') {

getcwd() . '/cvsweb.conf'

$config = $_ if defined($_) && -r $_;

) {

$config = $_ if defined($_) && -r $_;

}

# == Configuration defaults ==

Line 146 $allow_version_select = 1;

Line 145 $allow_version_select = 1;

# These are defined to allow checking with perl -cw

%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =

%tags = %alltags = @tabcolors = ();

$cvstreedefault = $body_tag = $body_tag_for_src =

$logo = $defaulttitle = $address =

$long_intro = $short_instruction = $shortLogLen =

$show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =

Line 224 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})

Line 223 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})

@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);

if (-f $config) {

do $config;

do $config

}

|| &fatal("500 Internal Error",

else {

sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',

$config, &htmlify($@)));

} else {

&fatal("500 Internal Error",

'Configuration not found. Set the variable <code>$config</code> '

. 'in cvsweb.cgi, or the environment variable '

Line 355 foreach my $k (keys %ICONS) {

Line 356 foreach my $k (keys %ICONS) {

}

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<BR><BR>%s<BR>',

$config_cvstree, &htmlify($@)));

}

$prcategories = '(?:' . join('|', @prcategories) . ')';

$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;

Line 1133 sub doAnnotate($$) {

Line 1141 sub doAnnotate($$) {

($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;

($filename = $where) =~ s/^.*\///;

http_header();

navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");

print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";

# this seems to be necessary

$| = 1; $| = 0; # Flush

Line 1147 sub doAnnotate($$) {

Line 1150 sub doAnnotate($$) {

# the public domain.

# we could abandon the use of rlog, rcsdiff and co using

# the cvsserver in a similiar way one day (..after rewrite)

$pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",

$pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error",

"Fatal Error - unable to open cvs for annotation");

# OK, first send the request to the server. A simplified example is:

Line 1199 sub doAnnotate($$) {

Line 1202 sub doAnnotate($$) {

# were nicer about buffering, then we could just leave it open, I think.

close ($writer) || die "cannot close: $!";

http_header();

navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");

print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";

# Ready to get the responses from the server.

# For example:

# E Annotations for foo/xx

Line 1231 sub doAnnotate($$) {

Line 1239 sub doAnnotate($$) {

}

elsif ($words[0] eq "M") {

$lineNr++;

my $lrev = substr ($_, 2, 13);

(my $lrev = substr($_, 2, 13)) =~ y/ //d;

my $lusr = substr ($_, 16, 9);

(my $lusr = substr($_, 16, 9)) =~ y/ //d;

my $line = substr ($_, 36);

my $line = substr($_, 36);

my $isCurrentRev = ($rev eq $lrev);

# we should parse the date here ..

if ($lrev eq $oldLrev) {

$revprint = " ";

$revprint = sprintf('%-8s', '');

}

else {

$revprint = $lrev; $oldLusr = "";

$revprint = sprintf('%-8s', $lrev);

$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`; # `

$revprint =~ s`\S+`<a href="${scriptwhere}${barequery}#rev$1">$&</A>`; # `

$oldLusr = '';

}

if ($lusr eq $oldLusr) {

$usrprint = " ";

$usrprint = '';

}

else {

$usrprint = $lusr;

}

$oldLrev = $lrev;

$oldLusr = $lusr;

# is there a less timeconsuming way to strip spaces ?

($lrev = $lrev) =~ s/\s+//g;

my $isCurrentRev = ($rev eq $lrev);

print "<b>" if ($isCurrentRev);

# Set bold for text-based browsers only - graphical

printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);

# browsers show bold fonts a bit wider than regular fonts,

# so it looks irregular.

print "<b>" if ($isCurrentRev && $is_textbased);

printf ("%s%s %-8s %4d:",

$revprint,

$isCurrentRev ? '!' : ' ',

$usrprint,

$lineNr);

print spacedHtmlText($line, $d{'tabstop'});

print "</b>" if ($isCurrentRev);

print "</b>" if ($isCurrentRev && $is_textbased);

}

elsif ($words[0] eq "ok") {

# We could complain about any text received after this, like the

Line 2470 sub navigateHeader($$$$$) {

Line 2486 sub navigateHeader($$$$$) {

$swhere = urlencode($filename) if ($swhere eq "");

print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";

print "<HTML>\n<HEAD>\n";

print '';

print '';

print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";

print "$body_tag_for_src\n";

print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";

Line 2825 sub http_header(;$) {

Line 2841 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

my $version = '$zRevision: 1.103 $ $kRevision: 1.26 $'; #'

my $version = '$zRevision: 1.103 $ $Revision$'; #'

http_header();

print <<EOH;

<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"

CVSweb