Bug 150153 - ConnectToDatabase/quietly_check_login issues pt 2

r=jouni x2

diff --git a/CGI.pl b/CGI.pl
index 04a683a47296da204458168342a138c389c9ec72..ea305db53205c4066a41cfc5c77aebb2c0f158c8 100644 (file)
--- a/CGI.pl
+++ b/CGI.pl
@@ -442,7 +442,6 @@ sub quietly_check_login() {
     $::userid = 0;
     if (defined $::COOKIE{"Bugzilla_login"} &&
         defined $::COOKIE{"Bugzilla_logincookie"}) {
-        ConnectToDatabase();
         SendSQL("SELECT profiles.userid, profiles.groupset, " .
                 "profiles.login_name, " .
                 "profiles.login_name = " .
@@ -559,7 +558,6 @@ sub confirm_login {
 # Uncommenting the next line can help debugging...
 #    print "Content-type: text/plain\n\n";
 
-    ConnectToDatabase();
     # I'm going to reorganize some of this stuff a bit.  Since we're adding
     # a second possible validation method (LDAP), we need to move some of this
     # to a later section.  -Joe Robins, 8/3/00

diff --git a/globals.pl b/globals.pl
index 4f93820ffb94ebc29b1465c72b306cc77efd44b8..f32fc1f3d4ce7630a12a6d7bc384a72de3fa3b70 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -438,7 +438,6 @@ sub GenerateArrayCode {
 
 
 sub GenerateVersionTable {
-    ConnectToDatabase();
     SendSQL("select value, program from versions order by value");
     my @line;
     my %varray;
@@ -1251,7 +1250,6 @@ sub UserInGroup {
     if ($::usergroupset eq "0") {
         return 0;
     }
-    ConnectToDatabase();
     PushGlobalSQLState();
     SendSQL("select (bit & $::usergroupset) != 0 from groups where name = " . SqlQuote($groupname));
     my $bit = FetchOneColumn();
@@ -1274,7 +1272,6 @@ sub BugInGroup {
 
 sub GroupExists {
     my ($groupname) = (@_);
-    ConnectToDatabase();
     PushGlobalSQLState();
     SendSQL("select count(*) from groups where name=" . SqlQuote($groupname));
     my $count = FetchOneColumn();
@@ -1287,7 +1284,6 @@ sub GroupExists {
 # !!! Remove this function when the new group system is implemented!
 sub GroupNameToBit {
     my ($groupname) = (@_);
-    ConnectToDatabase();
     PushGlobalSQLState();
     SendSQL("SELECT bit FROM groups WHERE name = " . SqlQuote($groupname));
     my $bit = FetchOneColumn() || 0;
@@ -1301,7 +1297,6 @@ sub GroupNameToBit {
 sub GroupIsActive {
     my ($groupbit) = (@_);
     $groupbit ||= 0;
-    ConnectToDatabase();
     PushGlobalSQLState();
     SendSQL("select isactive from groups where bit=$groupbit");
     my $isactive = FetchOneColumn();
@@ -1331,7 +1326,6 @@ sub OpenStates {
 
 sub RemoveVotes {
     my ($id, $who, $reason) = (@_);
-    ConnectToDatabase();
     my $whopart = "";
     if ($who) {
         $whopart = " AND votes.who = $who";