[BACK]Return to cvsweb.cgi CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 4.31 and 4.35

version 4.31, 2019/11/29 14:40:27 version 4.35, 2019/11/29 18:15:48
Line 56  use filetest qw(access);
Line 56  use filetest qw(access);
 use vars qw (  use vars qw (
   $VERSION $CheckoutMagic $MimeTypes $DEBUG    $VERSION $CheckoutMagic $MimeTypes $DEBUG
   $config $allow_version_select    $config $allow_version_select
   @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr    @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr %DEFAULTVALUE %MTYPES
   %DEFAULTVALUE %ICONS %MTYPES  
   %DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS    %DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
   %alltags %fileinfo %tags @branchnames %nameprinted    %alltags %fileinfo %tags @branchnames %nameprinted
   %symrev %revsym @allrevisions %date %author @revdisplayorder    %symrev %revsym @allrevisions %date %author @revdisplayorder
Line 68  use vars qw (
Line 67  use vars qw (
   %input $query $barequery $sortby $bydate $byrev $byauthor    %input $query $barequery $sortby $bydate $byrev $byauthor
   $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot    $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
   $charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon    $charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon
   $fullname $logo $defaulttitle $address $binfileicon    $fullname $logo $defaulttitle $address $binfileicon $iconsdir
   $long_intro $short_instruction $shortLogLen $show_author    $shortLogLen $show_author $hr_breakable $hr_ignwhite $hr_ignkeysubst
   $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst  
   $inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos    $inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos
   $allow_log_extra $allow_dir_extra $allow_source_extra    $allow_log_extra $allow_dir_extra $allow_source_extra
   $edit_option_form    $edit_option_form
Line 199  $config = '/conf/cvsweb/cvsweb.conf';
Line 197  $config = '/conf/cvsweb/cvsweb.conf';
   
 ######## Configuration parameters #########  ######## Configuration parameters #########
   
 @CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE = %ICONS =  @CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE =
   %MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();    %MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();
   
 $logo = $defaulttitle =  $logo = $defaulttitle =
   $address = $long_intro = $short_instruction = $shortLogLen = $show_author =    $address = $shortLogLen = $show_author =
   $tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =    $hr_breakable = $hr_ignwhite =
   $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =    $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =
   $allow_markup = $allow_compress = $edit_option_form =    $allow_markup = $allow_compress = $edit_option_form =
   $show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup =    $show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup =
Line 572  if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) {
Line 570  if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) {
   
 $cvsroot = $CVSROOT{$cvstree};  $cvsroot = $CVSROOT{$cvstree};
   
 # create icons out of description  if ($iconsdir) {
 foreach my $k (keys %ICONS) {    $backicon = '<img src="' . $iconsdir . '/back.gif" alt="[BACK]"' .
   my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}};      ' border="0" width="20" height="22"/>';
   no strict 'refs';    $diricon = '<img src="' . $iconsdir . '/dir.gif" alt="[DIR]"' .
   if ($ipath) {      ' border="0" width="20" height="22"/>';
     ${"${k}icon"} =    $fileicon = '<img src="' . $iconsdir . '/text.gif" alt="[TXT]"' .
       sprintf('<img src="%s" alt="%s" border="0" width="%d" height="%d" />',      ' border="0" width="20" height="22"/>';
               htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight);    $binfileicon = '<img src="' . $iconsdir . '/binary.gif" alt="[BIN]"' .
   } else {      ' border="0" width="20" height="22"/>';
     ${"${k}icon"} = $itxt;  } else {
   }    $backicon = 'back';
     $diricon = 'dir';
     $fileicon = 'file';
     $binfileicon = 'binfile';
 }  }
   
 my $config_cvstree = "$config-$cvstree";  my $config_cvstree = "$config-$cvstree";
Line 722  if (-d $fullname) {
Line 723  if (-d $fullname) {
   
   if ($where eq '/') {    if ($where eq '/') {
     html_header($defaulttitle);      html_header($defaulttitle);
     $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g;  
     print $long_intro;  
   } else {    } else {
     html_header($where);      html_header($where);
     my $html = (-f catfile($fullname, 'README.cvs.html,v') ||      my $html = (-f catfile($fullname, 'README.cvs.html,v') ||
Line 760  if (-d $fullname) {
Line 759  if (-d $fullname) {
       }        }
       $h->finish();        $h->finish();
     }      }
     print $short_instruction;  
   }    }
   
   if ($use_descriptions &&    if ($use_descriptions &&
Line 789  if (-d $fullname) {
Line 787  if (-d $fullname) {
   
   my $infocols = 1;    my $infocols = 1;
   
   printf(<<EOF, $tablepadding, 'Directory index of ' . htmlquote($where));    printf(<<EOF, 'Directory index of ' . htmlquote($where));
 <table class="dir" width="100%%" cellspacing="0" cellpadding="%s" summary="%s">  <table class="dir" width="100%%" cellspacing="0" cellpadding="2" summary="%s">
 <tr>  <tr>
 EOF  EOF
   printf('<th colspan="2"%s>', ($byfile ? ' class="sorted"' : ''));    printf('<th colspan="2"%s>', ($byfile ? ' class="sorted"' : ''));
Line 2128  sub doDiff($$$$$$)
Line 2126  sub doDiff($$$$$$)
   my $human_readable = $difftype->{colored};    my $human_readable = $difftype->{colored};
   
   # Apply special diff options.    # Apply special diff options.
   push @difftype, '-p' if $showfunc;    push @difftype, '-p';
   
   if ($human_readable) {    if ($human_readable) {
     push(@difftype, '-w')  if $hr_ignwhite;      push(@difftype, '-w')  if $hr_ignwhite;
Legend:
Removed from v.4.31  
changed lines
  Added in v.4.35
CVSweb