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 <wicked@etlicon.fi>. r=bbaetz,
 kiko. a=justdave.

---
 attachment.cgi | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'attachment.cgi')

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
-- 
cgit v1.2.3-24-g4f1b