===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -p -r3.30 -r3.31
--- cvsweb/cvsweb.cgi	2000/09/30 20:10:01	3.30
+++ cvsweb/cvsweb.cgi	2000/10/02 19:07:08	3.31
@@ -43,7 +43,7 @@
 # SUCH DAMAGE.
 #
 # $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $Id: cvsweb.cgi,v 3.30 2000/09/30 20:10:01 knu Exp $
+# $Id: cvsweb.cgi,v 3.31 2000/10/02 19:07:08 knu Exp $
 #
 ###
 
@@ -279,25 +279,24 @@ foreach (keys %DEFAULTVALUE)
 }
 
 $barequery = "";
+my @barequery;
 foreach (@stickyvars) {
     # construct a query string with the sticky non default parameters set
     if (defined($input{$_}) && $input{$_} ne '' &&
 	!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
-        if ($barequery) {
-	    $barequery = $barequery . "&amp;";
-	}
-	my $thisval = urlencode($_) . "=" . urlencode($input{$_});
-	$barequery .= $thisval;
+	push @barequery, join('=', urlencode($_), urlencode($input{$_});
     }
 }
 # is there any query ?
-if ($barequery) {
+if (@barequery) {
+    $barequery = join('&amp;', @barequery);
     $query = "?$barequery";
-    $barequery = "&amp;" . $barequery;
+    $barequery = "&amp;$barequery";
 }
 else {
     $query = "";
 }
+undef @barequery;
 
 # get actual parameters
 $sortby = $input{"sortby"};
@@ -345,7 +344,8 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) 
 $cvsroot = $CVSROOT{$cvstree};
 
 # create icons out of description
-foreach my $k (keys %ICONS) {
+my $k
+foreach $k (keys %ICONS) {
     no strict 'refs';
     my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
     if ($ipath) {
@@ -355,6 +355,7 @@ foreach my $k (keys %ICONS) {
 	${"${k}icon"} = $itxt;
     }
 }
+undef $k;
 
 my $config_cvstree = "$config-$cvstree";
 
@@ -365,6 +366,7 @@ if (-f $config_cvstree) {
 	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
 		       $config_cvstree, &htmlify($@)));
 }
+undef $config_cvstree;
 
 $prcategories = '(?:' . join('|', @prcategories) . ')';
 $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -2486,7 +2488,7 @@ 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 '<!-- CVSweb $zRevision: 1.103 $  $Revision: 3.30 $ -->';
+    print '<!-- CVSweb $zRevision: 1.103 $  $Revision: 3.31 $ -->';
     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\">";
@@ -2841,7 +2843,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $Revision: 3.30 $'; #'
+    my $version = '$zRevision: 1.103 $  $Revision: 3.31 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
