From 7277c16c2bea79a5f151ba84df45a745b74a0639 Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au"
 <bbaetz%student.usyd.edu.au@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 May 2002 23:38:17 +0000
Subject: [PATCH] Bug 144565 - describecomponents.cgi shows wrong components
 when user has access to only one product Bug 145113 - describecomponents
 doesn't call quietly_check_login() r=justdave, gerv

git-svn-id: svn://10.0.0.236/trunk@121977 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/describecomponents.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/bugzilla/describecomponents.cgi b/mozilla/webtools/bugzilla/describecomponents.cgi
index 8d2c219f4b4..8ae98260b3b 100755
--- a/mozilla/webtools/bugzilla/describecomponents.cgi
+++ b/mozilla/webtools/bugzilla/describecomponents.cgi
@@ -36,13 +36,15 @@ require "CGI.pl";
 ConnectToDatabase();
 GetVersionTable();
 
+quietly_check_login();
+
 if (!defined $::FORM{'product'}) {
     # Reference to a subset of %::proddesc, which the user is allowed to see
     my %products;
 
     if (Param("usebuggroups")) {
         # OK, now only add products the user can see
-        confirm_login();
+        confirm_login() unless $::userid;
         foreach my $p (@::legal_product) {
             if (!GroupExists($p) || UserInGroup($p)) {
                 $products{$p} = $::proddesc{$p};
@@ -72,7 +74,7 @@ if (!defined $::FORM{'product'}) {
         exit;
     }
 
-    $::FORM{'product'} = (keys %::proddesc)[0];
+    $::FORM{'product'} = (keys %products)[0];
 }
 
 my $product = $::FORM{'product'};
@@ -88,8 +90,8 @@ grep($product eq $_ , @::legal_product)
   && exit;
 
 # Make sure the user is authorized to access this product.
-if (Param("usebuggroups") && GroupExists($product) && !$::userid) {
-    confirm_login();
+if (Param("usebuggroups") && GroupExists($product)) {
+    confirm_login() unless $::userid;
     UserInGroup($product)
       || DisplayError("You are not authorized to access that product.")
         && exit;