===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.32
retrieving revision 4.35
diff -u -p -r4.32 -r4.35
--- cvsweb/cvsweb.cgi 2019/11/29 15:05:26 4.32
+++ cvsweb/cvsweb.cgi 2019/11/29 18:15:48 4.35
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.32 2019/11/29 15:05:26 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.35 2019/11/29 18:15:48 schwarze Exp $
# $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
#
# cvsweb - a CGI interface to CVS trees.
@@ -56,8 +56,7 @@ use filetest qw(access);
use vars qw (
$VERSION $CheckoutMagic $MimeTypes $DEBUG
$config $allow_version_select
- @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
- %DEFAULTVALUE %ICONS %MTYPES
+ @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr %DEFAULTVALUE %MTYPES
%DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
%alltags %fileinfo %tags @branchnames %nameprinted
%symrev %revsym @allrevisions %date %author @revdisplayorder
@@ -68,9 +67,8 @@ use vars qw (
%input $query $barequery $sortby $bydate $byrev $byauthor
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
$charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon
- $fullname $logo $defaulttitle $address $binfileicon
- $shortLogLen $show_author
- $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst
+ $fullname $logo $defaulttitle $address $binfileicon $iconsdir
+ $shortLogLen $show_author $hr_breakable $hr_ignwhite $hr_ignkeysubst
$inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos
$allow_log_extra $allow_dir_extra $allow_source_extra
$edit_option_form
@@ -199,12 +197,12 @@ $config = '/conf/cvsweb/cvsweb.conf';
######## Configuration parameters #########
-@CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE = %ICONS =
+@CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE =
%MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();
$logo = $defaulttitle =
$address = $shortLogLen = $show_author =
- $tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =
+ $hr_breakable = $hr_ignwhite =
$hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =
$allow_markup = $allow_compress = $edit_option_form =
$show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup =
@@ -572,17 +570,20 @@ if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) {
$cvsroot = $CVSROOT{$cvstree};
-# create icons out of description
-foreach my $k (keys %ICONS) {
- my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}};
- no strict 'refs';
- if ($ipath) {
- ${"${k}icon"} =
- sprintf('',
- htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight);
- } else {
- ${"${k}icon"} = $itxt;
- }
+if ($iconsdir) {
+ $backicon = '';
+ $diricon = '';
+ $fileicon = '';
+ $binfileicon = '';
+} else {
+ $backicon = 'back';
+ $diricon = 'dir';
+ $fileicon = 'file';
+ $binfileicon = 'binfile';
}
my $config_cvstree = "$config-$cvstree";
@@ -786,8 +787,8 @@ if (-d $fullname) {
my $infocols = 1;
- printf(<
+ printf(<
EOF
printf('', ($byfile ? ' class="sorted"' : ''));
@@ -2125,7 +2126,7 @@ sub doDiff($$$$$$)
my $human_readable = $difftype->{colored};
# Apply special diff options.
- push @difftype, '-p' if $showfunc;
+ push @difftype, '-p';
if ($human_readable) {
push(@difftype, '-w') if $hr_ignwhite;
|