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

Diff for /cvsweb/cvsweb.cgi between version 3.26 and 3.28

version 3.26, 2000/09/22 11:13:17 version 3.28, 2000/09/30 18:27:16
Line 125  sub forbidden_module($);
Line 125  sub forbidden_module($);
 use Cwd;  use Cwd;
   
 # == EDIT this ==  # == 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',       '/usr/local/etc/cvsweb.conf',
      getcwd . '/cvsweb.conf') {       getcwd() . '/cvsweb.conf'
   $config = $_ if defined($_) && -r $_;      ) {
       $config = $_ if defined($_) && -r $_;
 }  }
   
 # == Configuration defaults ==  # == Configuration defaults ==
Line 146  $allow_version_select = 1;
Line 145  $allow_version_select = 1;
 # These are defined to allow checking with perl -cw  # These are defined to allow checking with perl -cw
 %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =  %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
 %tags = %alltags = @tabcolors = ();  %tags = %alltags = @tabcolors = ();
 $cvstreedefault = $body_tag = $body_tag_for_src =  $cvstreedefault = $body_tag = $body_tag_for_src =
 $logo = $defaulttitle = $address =  $logo = $defaulttitle = $address =
 $long_intro = $short_instruction = $shortLogLen =  $long_intro = $short_instruction = $shortLogLen =
 $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =  $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);  @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
   
 if (-f $config) {  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",     &fatal("500 Internal Error",
           'Configuration not found.  Set the variable <code>$config</code> '            'Configuration not found.  Set the variable <code>$config</code> '
           . 'in cvsweb.cgi, or the environment variable '            . '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 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) . ')';  $prcategories = '(?:' . join('|', @prcategories) . ')';
 $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;  $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;

Legend:
Removed from v.3.26  
changed lines
  Added in v.3.28

CVSweb