From 4df1c8fd665e5fc7c66e265b1f32b75837ae719f Mon Sep 17 00:00:00 2001 From: "kiko%async.com.br" <> Date: Sat, 27 Mar 2004 11:51:43 +0000 Subject: Fix for bug 234175: Remove deprecated ConnectToDatabase() and quietly_check_login()/confirm_login() calls. Cleans up callsites (consisting of most of our CGIs), swapping (where appropriate) for calls to Bugzilla->login. Patch by Teemu Mannermaa . r=bbaetz, kiko. a=justdave. --- Bugzilla/DB.pm | 10 +--------- CGI.pl | 8 -------- attachment.cgi | 18 ++++++++---------- buglist.cgi | 15 +++++++-------- chart.cgi | 5 ++--- colchange.cgi | 3 +-- collectstats.pl | 1 - config.cgi | 4 ---- contrib/bug_email.pl | 4 +--- contrib/bugzilla_email_append.pl | 2 -- contrib/syncLDAP.pl | 2 -- createaccount.cgi | 4 +--- describecomponents.cgi | 7 +++---- describekeywords.cgi | 4 +--- doeditparams.cgi | 4 ++-- duplicates.cgi | 3 +-- editcomponents.cgi | 4 ++-- editflagtypes.cgi | 6 ++---- editgroups.cgi | 3 +-- editkeywords.cgi | 4 ++-- editmilestones.cgi | 4 ++-- editparams.cgi | 4 ++-- editproducts.cgi | 3 +-- editusers.cgi | 4 ++-- editversions.cgi | 4 ++-- enter_bug.cgi | 11 +++-------- importxml.pl | 1 - index.cgi | 6 ++---- long_list.cgi | 4 +--- move.pl | 4 ++-- page.cgi | 4 +--- post_bug.cgi | 3 +-- process_bug.cgi | 3 +-- query.cgi | 8 ++++---- queryhelp.cgi | 3 +-- quips.cgi | 5 +++-- relogin.cgi | 6 ++---- report.cgi | 5 ++--- reports.cgi | 3 +-- request.cgi | 5 +---- sanitycheck.cgi | 4 +--- show_activity.cgi | 4 +--- show_bug.cgi | 7 +++---- showdependencygraph.cgi | 4 +--- showdependencytree.cgi | 4 +--- sidebar.cgi | 3 +-- token.cgi | 6 +++--- userprefs.cgi | 3 +-- votes.cgi | 7 +++---- whineatnews.pl | 2 -- 50 files changed, 84 insertions(+), 161 deletions(-) diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index a747aebd6..684869006 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -33,7 +33,7 @@ use base qw(Exporter); %Bugzilla::DB::EXPORT_TAGS = ( - deprecated => [qw(ConnectToDatabase SendSQL SqlQuote + deprecated => [qw(SendSQL SqlQuote MoreSQLData FetchSQLData FetchOneColumn PushGlobalSQLState PopGlobalSQLState) ], @@ -49,10 +49,6 @@ use Bugzilla::Util; # having a separate package for it, or otherwise trying to avoid the circular # dependancy -sub ConnectToDatabase { - # We've already been connected in Bugzilla.pm -} - # XXX - mod_perl # These use |our| instead of |my| because they need to be cleared from # Bugzilla.pm. See bug 192531 for details. @@ -222,10 +218,6 @@ and so are not documented. =item * -ConnectToDatabase - -=item * - SendSQL =item * diff --git a/CGI.pl b/CGI.pl index 982b067b2..6d10268d3 100644 --- a/CGI.pl +++ b/CGI.pl @@ -198,10 +198,6 @@ sub PasswordForLogin { return $result; } -sub quietly_check_login { - return Bugzilla->login($_[0] ? LOGIN_OPTIONAL : LOGIN_NORMAL); -} - sub CheckEmailSyntax { my ($addr) = (@_); my $match = Param('emailregexp'); @@ -224,10 +220,6 @@ sub MailPassword { close SENDMAIL; } -sub confirm_login { - return Bugzilla->login(LOGIN_REQUIRED); -} - sub PutHeader { ($vars->{'title'}, $vars->{'h1'}, $vars->{'h2'}) = (@_); diff --git a/attachment.cgi b/attachment.cgi index 8df562120..61565f01f 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -42,16 +42,14 @@ use vars qw( require "CGI.pl"; # Use these modules to handle flags. +use Bugzilla::Constants; use Bugzilla::Flag; use Bugzilla::FlagType; use Bugzilla::User; use Bugzilla::Util; -# Establish a connection to the database backend. -ConnectToDatabase(); - # Check whether or not the user is logged in and, if so, set the $::userid -quietly_check_login(); +Bugzilla->login(); # The ID of the bug to which the attachment is attached. Gets set # by validateID() (which validates the attachment ID, not the bug ID, but has @@ -104,14 +102,14 @@ elsif ($action eq "viewall") } elsif ($action eq "enter") { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); ValidateBugID($::FORM{'bugid'}); validateCanChangeBug($::FORM{'bugid'}); enter(); } elsif ($action eq "insert") { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); ValidateBugID($::FORM{'bugid'}); validateCanChangeBug($::FORM{'bugid'}); ValidateComment($::FORM{'comment'}); @@ -125,14 +123,13 @@ elsif ($action eq "insert") } elsif ($action eq "edit") { - quietly_check_login(); validateID(); validateCanEdit($::FORM{'id'}); edit(); } elsif ($action eq "update") { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); ValidateComment($::FORM{'comment'}); validateID(); validateCanEdit($::FORM{'id'}); @@ -216,9 +213,10 @@ sub validateCanEdit my ($attach_id) = (@_); # If the user is not logged in, claim that they can edit. This allows - # the edit scrren to be displayed to people who aren't logged in. + # the edit screen to be displayed to people who aren't logged in. # People not logged in can't actually commit changes, because that code - # calls confirm_login, not quietly_check_login, before calling this sub + # calls Bugzilla->login with LOGIN_REQUIRED, not with LOGIN_NORMAL, + # before calling this sub return if $::userid == 0; # People in editbugs can edit all attachments diff --git a/buglist.cgi b/buglist.cgi index 8a02ca490..2a71450aa 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -37,6 +37,7 @@ use vars qw($template $vars); use Bugzilla; use Bugzilla::Search; +use Bugzilla::Constants; # Include the Bugzilla CGI and general utility library. require "CGI.pl"; @@ -63,8 +64,6 @@ if (length($::buffer) == 0) { ThrowUserError("buglist_parameters_required"); } -ConnectToDatabase(); - ################################################################################ # Data and Security Validation ################################################################################ @@ -74,12 +73,12 @@ my $dotweak = $::FORM{'tweak'} ? 1 : 0; # Log the user in if ($dotweak) { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); UserInGroup("editbugs") || ThrowUserError("insufficient_privs_for_multi"); GetVersionTable(); } else { - quietly_check_login(); + Bugzilla->login(); } # Hack to support legacy applications that think the RDF ctype is at format=rdf. @@ -182,7 +181,7 @@ sub iCalendarDateTime { sub LookupNamedQuery { my ($name) = @_; - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); my $userid = DBNameToIdAndCheck($::COOKIE{"Bugzilla_login"}); my $qname = SqlQuote($name); SendSQL("SELECT query FROM namedqueries WHERE userid = $userid AND name = $qname"); @@ -305,7 +304,7 @@ if ($::FORM{'cmdtype'} eq "dorem") { $order = $params->param('order') || $order; } elsif ($::FORM{'remaction'} eq "forget") { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); my $userid = DBNameToIdAndCheck($::COOKIE{"Bugzilla_login"}); my $qname = SqlQuote($::FORM{'namedcmd'}); SendSQL("DELETE FROM namedqueries WHERE userid = $userid AND name = $qname"); @@ -325,7 +324,7 @@ if ($::FORM{'cmdtype'} eq "dorem") { } elsif (($::FORM{'cmdtype'} eq "doit") && $::FORM{'remtype'}) { if ($::FORM{'remtype'} eq "asdefault") { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); my $userid = DBNameToIdAndCheck($::COOKIE{"Bugzilla_login"}); my $qname = SqlQuote($::defaultqueryname); my $qbuffer = SqlQuote($::buffer); @@ -335,7 +334,7 @@ elsif (($::FORM{'cmdtype'} eq "doit") && $::FORM{'remtype'}) { $vars->{'message'} = "buglist_new_default_query"; } elsif ($::FORM{'remtype'} eq "asnamed") { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); my $userid = DBNameToIdAndCheck($::COOKIE{"Bugzilla_login"}); my $name = trim($::FORM{'newqueryname'}); diff --git a/chart.cgi b/chart.cgi index dbdd818bc..229e9bbf7 100755 --- a/chart.cgi +++ b/chart.cgi @@ -45,6 +45,7 @@ use strict; use lib qw(.); require "CGI.pl"; +use Bugzilla::Constants; use Bugzilla::Chart; use Bugzilla::Series; @@ -81,9 +82,7 @@ if ($action eq "search") { exit; } -ConnectToDatabase(); - -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); # Only admins may create public queries UserInGroup('admin') || $cgi->delete('public'); diff --git a/colchange.cgi b/colchange.cgi index 726e60d51..dcd611dad 100755 --- a/colchange.cgi +++ b/colchange.cgi @@ -36,8 +36,7 @@ use Bugzilla; require "CGI.pl"; -ConnectToDatabase(); -quietly_check_login(); +Bugzilla->login(); GetVersionTable(); diff --git a/collectstats.pl b/collectstats.pl index e04169453..7391d32da 100755 --- a/collectstats.pl +++ b/collectstats.pl @@ -51,7 +51,6 @@ if (chdir("graphs")) { chdir(".."); } -ConnectToDatabase(); GetVersionTable(); Bugzilla->switch_to_shadow_db(); diff --git a/config.cgi b/config.cgi index f7cb95ee5..a2c22d001 100755 --- a/config.cgi +++ b/config.cgi @@ -33,10 +33,6 @@ use strict; use lib qw(.); require "CGI.pl"; -# Connect to the database so we can check whether the user is a member -# of each product group. -ConnectToDatabase(); - # Retrieve this installation's configuration. GetVersionTable(); diff --git a/contrib/bug_email.pl b/contrib/bug_email.pl index a8b89714d..a4bae060c 100755 --- a/contrib/bug_email.pl +++ b/contrib/bug_email.pl @@ -38,7 +38,7 @@ # # You need to work with bug_email.pl the MIME::Parser installed. # -# $Id: bug_email.pl,v 1.18 2004/01/20 06:03:38 justdave%syndicomm.com Exp $ +# $Id: bug_email.pl,v 1.19 2004/03/27 03:51:44 kiko%async.com.br Exp $ ############################################################### # 02/12/2000 (SML) @@ -746,8 +746,6 @@ die (" *** Cant find Sender-adress in sent mail ! ***\n" ) unless defined( $Send chomp( $Sender ); chomp( $Message_ID ); -ConnectToDatabase(); - $SenderShort = $Sender; $SenderShort =~ s/^.*?([a-zA-Z0-9_.-]+?\@[a-zA-Z0-9_.-]+\.[a-zA-Z0-9_.-]+).*$/$1/; diff --git a/contrib/bugzilla_email_append.pl b/contrib/bugzilla_email_append.pl index da098e66c..007fd153c 100755 --- a/contrib/bugzilla_email_append.pl +++ b/contrib/bugzilla_email_append.pl @@ -68,8 +68,6 @@ chomp( $Message_ID ); print "Dealing with the sender $Sender\n"; -ConnectToDatabase(); - my $SenderShort = $Sender; $SenderShort =~ s/^.*?([a-zA-Z0-9_.-]+?\@[a-zA-Z0-9_.-]+\.[a-zA-Z0-9_.-]+).*$/$1/; diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl index 701695aea..b9d3e8a5f 100755 --- a/contrib/syncLDAP.pl +++ b/contrib/syncLDAP.pl @@ -74,8 +74,6 @@ foreach my $arg (@ARGV) } } -ConnectToDatabase(); - my %bugzilla_users; my %ldap_users; diff --git a/createaccount.cgi b/createaccount.cgi index 6c624b0ba..6364e20bc 100755 --- a/createaccount.cgi +++ b/createaccount.cgi @@ -36,13 +36,11 @@ use vars qw( $vars ); -ConnectToDatabase(); - # If we're using LDAP for login, then we can't create a new account here. unless (Bugzilla::Auth->can_edit) { # Just in case someone already has an account, let them get the correct # footer on the error message - quietly_check_login(); + Bugzilla->login(); ThrowUserError("auth_cant_create_account"); } diff --git a/describecomponents.cgi b/describecomponents.cgi index 1926a8826..6c99a0a63 100755 --- a/describecomponents.cgi +++ b/describecomponents.cgi @@ -23,7 +23,6 @@ use vars qw( %legal_product - $userid ); use strict; @@ -31,11 +30,11 @@ use strict; use lib qw(.); use Bugzilla; +use Bugzilla::Constants; require "CGI.pl"; -ConnectToDatabase(); -quietly_check_login(); +Bugzilla->login(); GetVersionTable(); @@ -48,7 +47,7 @@ if (!defined $product) { if (AnyEntryGroups()) { # OK, now only add products the user can see - confirm_login() unless $::userid; + Bugzilla->login(LOGIN_REQUIRED) unless Bugzilla->user; foreach my $p (@::legal_product) { if (CanEnterProduct($p)) { $products{$p} = $::proddesc{$p}; diff --git a/describekeywords.cgi b/describekeywords.cgi index 60c5a9fd8..8597e6791 100755 --- a/describekeywords.cgi +++ b/describekeywords.cgi @@ -31,9 +31,7 @@ require "CGI.pl"; # Use the global template variables. use vars qw($vars $template); -ConnectToDatabase(); - -quietly_check_login(); +Bugzilla->login(); my $cgi = Bugzilla->cgi; diff --git a/doeditparams.cgi b/doeditparams.cgi index 4799c99c0..679bd74e3 100755 --- a/doeditparams.cgi +++ b/doeditparams.cgi @@ -26,12 +26,12 @@ use strict; use lib qw(.); use Bugzilla; +use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT :admin $datadir); require "CGI.pl"; -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); my $cgi = Bugzilla->cgi; diff --git a/duplicates.cgi b/duplicates.cgi index aa627fc40..b45bd2710 100755 --- a/duplicates.cgi +++ b/duplicates.cgi @@ -54,7 +54,6 @@ if (defined $cgi->param('ctype') && $cgi->param('ctype') eq "xul") { # Use global templatisation variables. use vars qw($template $vars); -ConnectToDatabase(); GetVersionTable(); # collectstats.pl uses duplicates.cgi to generate the RDF duplicates stats. @@ -64,7 +63,7 @@ if ($::ENV{'GATEWAY_INTERFACE'} eq "cmdline") { Bugzilla->login(LOGIN_OPTIONAL); } else { - Bugzilla->login(LOGIN_NORMAL); + Bugzilla->login(); } Bugzilla->switch_to_shadow_db(); diff --git a/editcomponents.cgi b/editcomponents.cgi index 1cac27a99..5ed7a28d7 100755 --- a/editcomponents.cgi +++ b/editcomponents.cgi @@ -31,6 +31,7 @@ use lib "."; require "CGI.pl"; require "globals.pl"; +use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT $datadir); use Bugzilla::Series; @@ -195,8 +196,7 @@ sub PutTrailer (@) # Preliminary checks: # -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editflagtypes.cgi b/editflagtypes.cgi index 711828b6a..5fcabd73f 100755 --- a/editflagtypes.cgi +++ b/editflagtypes.cgi @@ -31,18 +31,16 @@ use lib "."; # Include the Bugzilla CGI and general utility library. require "CGI.pl"; -# Establish a connection to the database backend. -ConnectToDatabase(); - # Use Bugzilla's flag modules for handling flag types. use Bugzilla; +use Bugzilla::Constants; use Bugzilla::Flag; use Bugzilla::FlagType; use vars qw( $template $vars ); # Make sure the user is logged in and is an administrator. -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); UserInGroup("editcomponents") || ThrowUserError("authorization_failure", { action => "administer flag types" }); diff --git a/editgroups.cgi b/editgroups.cgi index e96545768..4f97972b3 100755 --- a/editgroups.cgi +++ b/editgroups.cgi @@ -34,8 +34,7 @@ require "CGI.pl"; use vars qw($template $vars); -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editkeywords.cgi b/editkeywords.cgi index 0069886cd..0083f8ee9 100755 --- a/editkeywords.cgi +++ b/editkeywords.cgi @@ -25,6 +25,7 @@ use lib "."; require "CGI.pl"; +use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT $datadir); my $cgi = Bugzilla->cgi; @@ -53,8 +54,7 @@ sub Validate ($$) { # Preliminary checks: # -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editmilestones.cgi b/editmilestones.cgi index 7a77de155..e707cf46d 100755 --- a/editmilestones.cgi +++ b/editmilestones.cgi @@ -19,6 +19,7 @@ use lib "."; require "CGI.pl"; require "globals.pl"; +use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT $datadir); # TestProduct: just returns if the specified product does exists @@ -144,8 +145,7 @@ sub PutTrailer (@) # Preliminary checks: # -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editparams.cgi b/editparams.cgi index dd61e9543..aaa2b087a 100755 --- a/editparams.cgi +++ b/editparams.cgi @@ -25,12 +25,12 @@ use strict; use lib "."; +use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT :admin); require "CGI.pl"; -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editproducts.cgi b/editproducts.cgi index f53779501..051fdb86c 100755 --- a/editproducts.cgi +++ b/editproducts.cgi @@ -179,8 +179,7 @@ sub PutTrailer (@) # Preliminary checks: # -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editusers.cgi b/editusers.cgi index e7ef0e7d3..3db5aef86 100755 --- a/editusers.cgi +++ b/editusers.cgi @@ -36,6 +36,7 @@ require "globals.pl"; use Bugzilla; use Bugzilla::User; +use Bugzilla::Constants; # Shut up misguided -w warnings about "used only once". "use vars" just # doesn't work for me. @@ -238,8 +239,7 @@ sub PutTrailer (@) # Preliminary checks: # -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/editversions.cgi b/editversions.cgi index 9c4a5e5ea..527f42aaf 100755 --- a/editversions.cgi +++ b/editversions.cgi @@ -32,6 +32,7 @@ use lib "."; require "CGI.pl"; require "globals.pl"; +use Bugzilla::Constants; use Bugzilla::Config qw(:DEFAULT $datadir); # TestProduct: just returns if the specified product does exists @@ -153,8 +154,7 @@ sub PutTrailer (@) # Preliminary checks: # -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); print Bugzilla->cgi->header(); diff --git a/enter_bug.cgi b/enter_bug.cgi index eca672a45..1dd02c90c 100755 --- a/enter_bug.cgi +++ b/enter_bug.cgi @@ -57,20 +57,15 @@ use vars qw( $proddesc ); -# We have to connect to the database, even though we don't use it in this code, -# because we might occasionally rebuild the version cache, which causes tokens -# to get deleted from the database, which needs a database connection. -ConnectToDatabase(); - # If we're using bug groups to restrict bug entry, we need to know who the # user is right from the start. -confirm_login() if AnyEntryGroups(); +Bugzilla->login(LOGIN_REQUIRED) if AnyEntryGroups(); my $cgi = Bugzilla->cgi; if (!defined $::FORM{'product'}) { GetVersionTable(); - quietly_check_login(); + Bugzilla->login(); my %products; @@ -225,7 +220,7 @@ sub pickos { # End of subroutines ############################################################################## -confirm_login() if (!(AnyEntryGroups())); +Bugzilla->login(LOGIN_REQUIRED) if (!(AnyEntryGroups())); # We need to check and make sure # that the user has permission to enter a bug against this product. diff --git a/importxml.pl b/importxml.pl index 5b0599e98..f23387176 100755 --- a/importxml.pl +++ b/importxml.pl @@ -71,7 +71,6 @@ require "CGI.pl"; require "globals.pl"; $::lockcount = 0; -ConnectToDatabase(); GetVersionTable(); diff --git a/index.cgi b/index.cgi index bbe936207..88393b417 100755 --- a/index.cgi +++ b/index.cgi @@ -36,11 +36,9 @@ use vars qw( $vars ); -# Establish a connection to the database backend. -ConnectToDatabase(); - # Check whether or not the user is logged in and, if so, set the $::userid -quietly_check_login('permit_anonymous'); +use Bugzilla::Constants; +Bugzilla->login(LOGIN_OPTIONAL); ############################################################################### # Main Body Execution diff --git a/long_list.cgi b/long_list.cgi index 72c579ac4..657ff9e24 100755 --- a/long_list.cgi +++ b/long_list.cgi @@ -33,9 +33,7 @@ use vars qw($userid @legal_keywords); # Use global template variables. use vars qw($template $vars); -ConnectToDatabase(); - -quietly_check_login(); +Bugzilla->login(); GetVersionTable(); diff --git a/move.pl b/move.pl index b4d47a40f..99ed585f3 100755 --- a/move.pl +++ b/move.pl @@ -31,6 +31,7 @@ require "CGI.pl"; use vars qw($template $userid %COOKIE); use Bugzilla; +use Bugzilla::Constants; use Bugzilla::Bug; use Bugzilla::Config qw(:DEFAULT $datadir); use Bugzilla::BugMail; @@ -43,8 +44,7 @@ unless ( Param("move-enabled") ) { exit; } -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); my $cgi = Bugzilla->cgi; diff --git a/page.cgi b/page.cgi index 91027ff4f..b68a9313b 100755 --- a/page.cgi +++ b/page.cgi @@ -38,9 +38,7 @@ require "CGI.pl"; use vars qw($template $vars); -ConnectToDatabase(); - -quietly_check_login(); +Bugzilla->login(); my $cgi = Bugzilla->cgi; diff --git a/post_bug.cgi b/post_bug.cgi index d6fda9b3b..800b46f01 100755 --- a/post_bug.cgi +++ b/post_bug.cgi @@ -53,8 +53,7 @@ sub sillyness { # Use global template variables. use vars qw($vars $template); -ConnectToDatabase(); -my $user = confirm_login(); +my $user = Bugzilla->login(LOGIN_REQUIRED); my $cgi = Bugzilla->cgi; diff --git a/process_bug.cgi b/process_bug.cgi index 4df90efd2..e54a46965 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -55,8 +55,7 @@ use vars qw(%versions %legal_severity ); -ConnectToDatabase(); -my $user = confirm_login(); +my $user = Bugzilla->login(LOGIN_REQUIRED); my $whoid = $user->id; my $cgi = Bugzilla->cgi; diff --git a/query.cgi b/query.cgi index 7786da96b..a37fc9125 100755 --- a/query.cgi +++ b/query.cgi @@ -28,6 +28,8 @@ use lib "."; require "CGI.pl"; +use Bugzilla::Constants; + use vars qw( @CheckOptionValues @legal_resolution @@ -49,16 +51,14 @@ use vars qw( $vars ); -ConnectToDatabase(); - my $cgi = Bugzilla->cgi; if (defined $::FORM{"GoAheadAndLogIn"}) { # We got here from a login page, probably from relogin.cgi. We better # make sure the password is legit. - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); } else { - quietly_check_login(); + Bugzilla->login(); } my $user = Bugzilla->user; diff --git a/queryhelp.cgi b/queryhelp.cgi index 60ebdd120..361ebc382 100755 --- a/queryhelp.cgi +++ b/queryhelp.cgi @@ -28,8 +28,7 @@ use lib qw(.); require "CGI.pl"; -ConnectToDatabase(); -quietly_check_login(); +Bugzilla->login(); GetVersionTable(); diff --git a/quips.cgi b/quips.cgi index bf1c41450..9bb6ea43a 100755 --- a/quips.cgi +++ b/quips.cgi @@ -36,8 +36,9 @@ use lib qw(.); require "CGI.pl"; -ConnectToDatabase(); -confirm_login(); +use Bugzilla::Constants; + +Bugzilla->login(LOGIN_REQUIRED); my $cgi = Bugzilla->cgi; diff --git a/relogin.cgi b/relogin.cgi index b7ba4f61e..6843405c2 100755 --- a/relogin.cgi +++ b/relogin.cgi @@ -30,11 +30,9 @@ use lib qw(.); require "CGI.pl"; # We don't want to remove a random logincookie from the db, so -# call quietly_check_login. If we're logged in after this, then +# call Bugzilla->login(). If we're logged in after this, then # the logincookie must be correct - -ConnectToDatabase(); -quietly_check_login(); +Bugzilla->login(); Bugzilla->logout(); diff --git a/report.cgi b/report.cgi index 2c0c430a9..cb872fc5b 100755 --- a/report.cgi +++ b/report.cgi @@ -29,6 +29,7 @@ require "CGI.pl"; use vars qw($template $vars); use Bugzilla; +use Bugzilla::Constants; my $cgi = Bugzilla->cgi; @@ -44,11 +45,9 @@ if (grep(/^cmd-/, $cgi->param())) { use Bugzilla::Search; -ConnectToDatabase(); - GetVersionTable(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); Bugzilla->switch_to_shadow_db(); diff --git a/reports.cgi b/reports.cgi index b863249d6..01ce99277 100755 --- a/reports.cgi +++ b/reports.cgi @@ -56,8 +56,7 @@ use Bugzilla; # If we're using bug groups for products, we should apply those restrictions # to viewing reports, as well. Time to check the login in that case. -ConnectToDatabase(); -quietly_check_login(); +Bugzilla->login(); GetVersionTable(); diff --git a/request.cgi b/request.cgi index 90304a2b9..43be69856 100755 --- a/request.cgi +++ b/request.cgi @@ -31,9 +31,6 @@ use strict; use lib qw(.); require "CGI.pl"; -# Establish a connection to the database backend. -ConnectToDatabase(); - # Use Bugzilla's Request module which contains utilities for handling requests. use Bugzilla::Flag; use Bugzilla::FlagType; @@ -44,7 +41,7 @@ use Bugzilla::User; use vars qw($template $vars @legal_product @legal_components %components); # Make sure the user is logged in. -quietly_check_login(); +Bugzilla->login(); ################################################################################ # Main Body Execution diff --git a/sanitycheck.cgi b/sanitycheck.cgi index 8060c1c99..51b499025 100755 --- a/sanitycheck.cgi +++ b/sanitycheck.cgi @@ -70,9 +70,7 @@ sub BugListLinks { # Start ########################################################################### -ConnectToDatabase(); - -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); my $cgi = Bugzilla->cgi; diff --git a/show_activity.cgi b/show_activity.cgi index e1697255b..5ab4e366e 100755 --- a/show_activity.cgi +++ b/show_activity.cgi @@ -30,14 +30,12 @@ use vars qw ($template $vars); require "CGI.pl"; my $cgi = Bugzilla->cgi; -ConnectToDatabase(); - ############################################################################### # Begin Data/Security Validation ############################################################################### # Check whether or not the user is currently logged in. -quietly_check_login(); +Bugzilla->login(); # Make sure the bug ID is a positive integer representing an existing # bug that the user is authorized to access. diff --git a/show_bug.cgi b/show_bug.cgi index 6d971bbfc..4b2459f90 100755 --- a/show_bug.cgi +++ b/show_bug.cgi @@ -25,11 +25,10 @@ use strict; use lib qw(.); use Bugzilla; +use Bugzilla::Constants; require "CGI.pl"; -ConnectToDatabase(); - use vars qw($template $vars $userid); use Bugzilla::Bug; @@ -37,9 +36,9 @@ use Bugzilla::Bug; my $cgi = Bugzilla->cgi; if ($::FORM{'GoAheadAndLogIn'}) { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); } else { - quietly_check_login(); + Bugzilla->login(); } # Editable, 'single' HTML bugs are treated slightly specially in a few places diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index a863df142..e0bd376d5 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -31,9 +31,7 @@ use Bugzilla::Config qw(:DEFAULT $webdotdir); require "CGI.pl"; -ConnectToDatabase(); - -quietly_check_login(); +Bugzilla->login(); my $cgi = Bugzilla->cgi; diff --git a/showdependencytree.cgi b/showdependencytree.cgi index b82443226..202043acd 100755 --- a/showdependencytree.cgi +++ b/showdependencytree.cgi @@ -31,9 +31,7 @@ require "CGI.pl"; # Use global template variables. use vars qw($template $vars); -ConnectToDatabase(); - -quietly_check_login(); +Bugzilla->login(); my $cgi = Bugzilla->cgi; diff --git a/sidebar.cgi b/sidebar.cgi index cf801eba3..73a22d1b3 100755 --- a/sidebar.cgi +++ b/sidebar.cgi @@ -26,8 +26,7 @@ use vars qw( $vars ); -ConnectToDatabase(); -quietly_check_login(); +Bugzilla->login(); my $cgi = Bugzilla->cgi; diff --git a/token.cgi b/token.cgi index 697da39b1..36508f0a5 100755 --- a/token.cgi +++ b/token.cgi @@ -32,14 +32,14 @@ use lib qw(.); use vars qw($template $vars); use Bugzilla; +use Bugzilla::Constants; + my $cgi = Bugzilla->cgi; # Include the Bugzilla CGI and general utility library. require "CGI.pl"; -# Establish a connection to the database backend. -ConnectToDatabase(); -quietly_check_login('permit_anonymous'); +Bugzilla->login(LOGIN_OPTIONAL); # Use the "Bugzilla::Token" module that contains functions for doing various # token-related tasks. diff --git a/userprefs.cgi b/userprefs.cgi index 15afdb21c..eefe40205 100755 --- a/userprefs.cgi +++ b/userprefs.cgi @@ -308,8 +308,7 @@ sub DoSavedSearches() { # Live code (not subroutine definitions) starts here ############################################################################### -ConnectToDatabase(); -confirm_login(); +Bugzilla->login(LOGIN_REQUIRED); GetVersionTable(); diff --git a/votes.cgi b/votes.cgi index ed7f6ad51..937149b3d 100755 --- a/votes.cgi +++ b/votes.cgi @@ -27,14 +27,13 @@ use strict; use lib "."; use Bugzilla; +use Bugzilla::Constants; require "CGI.pl"; # Use global template variables use vars qw($template $vars); -ConnectToDatabase(); - my $cgi = Bugzilla->cgi; # If the action is show_bug, you need a bug_id. @@ -51,10 +50,10 @@ my $action = $::FORM{'action'} || if ($action eq "show_bug" || ($action eq "show_user" && defined($::FORM{'user'}))) { - quietly_check_login(); + Bugzilla->login(); } else { - confirm_login(); + Bugzilla->login(LOGIN_REQUIRED); } ################################################################################ diff --git a/whineatnews.pl b/whineatnews.pl index 57a823583..b5fd020a9 100755 --- a/whineatnews.pl +++ b/whineatnews.pl @@ -31,8 +31,6 @@ use strict; require "globals.pl"; -ConnectToDatabase(); - SendSQL("select bug_id,short_desc,login_name from bugs,profiles where " . "(bug_status = 'NEW' or bug_status = 'REOPENED') and " . "to_days(now()) - to_days(delta_ts) > " . Param('whinedays') . -- cgit v1.2.3-24-g4f1b