===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.25
retrieving revision 4.27
diff -u -p -r4.25 -r4.27
--- cvsweb/cvsweb.cgi	2019/11/26 11:53:01	4.25
+++ cvsweb/cvsweb.cgi	2019/11/26 12:09:02	4.27
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.25 2019/11/26 11:53:01 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.27 2019/11/26 12:09:02 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -57,7 +57,7 @@ use vars qw (
   $VERSION $CheckoutMagic $MimeTypes $DEBUG
   $config $allow_version_select
   @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
-  %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
+  %DEFAULTVALUE %ICONS %MTYPES
   %DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
   %alltags %fileinfo %tags @branchnames %nameprinted
   %symrev %revsym @allrevisions %date %author @revdisplayorder
@@ -69,7 +69,7 @@ use vars qw (
   $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
   $charset $output_filter
   @command_path %CMD $allow_compress $backicon $diricon $fileicon
-  $fullname $cvstreedefault $logo $defaulttitle $address $binfileicon
+  $fullname $logo $defaulttitle $address $binfileicon
   $long_intro $short_instruction $shortLogLen $show_author
   $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst
   $inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos
@@ -167,7 +167,6 @@ sub plural_write($$);
 sub readableTime($$);
 sub clickablePath($$);
 sub chooseCVSRoot();
-sub chooseMirror();
 sub fileSortCmp();
 sub download_url($$;$);
 sub download_link($$$;$);
@@ -195,10 +194,10 @@ $config = '/conf/cvsweb/cvsweb.conf';
 
 ######## Configuration parameters #########
 
-@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS =
+@CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE = %ICONS =
   %MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();
 
-$cvstreedefault = $logo = $defaulttitle =
+$logo = $defaulttitle =
   $address = $long_intro = $short_instruction = $shortLogLen = $show_author =
   $tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =
   $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =
@@ -472,7 +471,6 @@ for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2
     next;
   }
   $rootfound ||= 1;
-  $cvstreedefault = $key unless defined($cvstreedefault);
   $CVSROOTdescr{$key} = $descr;
   $CVSROOT{$key} = $root;
   push(@CVSROOT, $key);
@@ -485,20 +483,8 @@ unless ($rootfound) {
 }
 undef $rootfound;
 
-#
-# Default CVS root
-#
-if (!defined($CVSROOT{$cvstreedefault})) {
-  fatal("500 Internal Error",
-        '<code>$cvstreedefault</code> points to a repository (%s) not ' .
-        'defined in <code>@CVSrepositories</code> in your configuration ' .
-        'file (<code>%s</code>).',
-        $cvstreedefault,
-        $config);
-}
+$DEFAULTVALUE{cvsroot} = $CVSrepositories[0];
 
-$DEFAULTVALUE{cvsroot} = $cvstreedefault;
-
 while (my ($key, $defval) = each %DEFAULTVALUE) {
 
   # Replace not given parameters with defaults.
@@ -576,7 +562,7 @@ $logsort = $input{logsort};
 if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) {
   $cvstree = $input{cvsroot};
 } else {
-  $cvstree = $cvstreedefault;
+  $cvstree = $CVSrepositories[0];
 }
 
 $cvsroot = $CVSROOT{$cvstree};
@@ -801,9 +787,7 @@ if (-d $fullname) {
 
   # give direct access to dirs
   if ($where eq '/') {
-    chooseMirror();
     chooseCVSRoot();
-
   } else {
     print '<p>Current directory: <b>', clickablePath($where, 0), '</b>';
     print "</p>\n";
@@ -1134,7 +1118,7 @@ EOF
       printf(qq{<input type="hidden" name="%s" value="%s" />\n},
              $v, $input{$v} || 0);
     }
-    if ($cvstree ne $cvstreedefault) {
+    if ($cvstree ne $CVSrepositories[0]) {
       print "<input type=\"hidden\" name=\"cvsroot\" value=\"$cvstree\" />\n";
     }
     print <<EOF;
@@ -3492,27 +3476,6 @@ Module path or alias:
 </p>
 </form>
 EOF
-}
-
-
-sub chooseMirror()
-{
-  # This code comes from the original BSD-cvsweb
-  # and may not be useful for your site; If you don't
-  # set %MIRRORS this won't show up, anyway.
-  scalar(%MIRRORS) or return;
-
-  # Should perhaps exclude the current site somehow...
-  print "\n<p>\nThis CVSweb is mirrored in\n";
-
-  my @tmp = map(&link(htmlquote($_), $MIRRORS{$_}), sort keys %MIRRORS);
-  my $tmp = pop (@tmp);
-
-  if (scalar(@tmp)) {
-    print join (', ', @tmp), ' and ';
-  }
-
-  print "$tmp.\n</p>\n";
 }