Patch for bug 232155: Remove uninitialized value warning from Pperl's Cookie.pm…

Patch for bug 232155: Remove uninitialized value warning from Pperl's Cookie.pm and unify code by removing redundancy; patch by Christian Reis <kiko@async.com.br> backported to 2.18 by Rob Siklos <rsiklos@adexa.com>; r=vladd,kiko, a=justdave.

Patch for bug 232155: Remove uninitialized value warning from Pperl's Cookie.pm…
f99b4377 · jocuri%softhome.net · ad211c0a · f99b4377
Commit f99b4377 authored Oct 21, 2004 by jocuri%softhome.net
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

CGI.pm Bugzilla/Auth/Login/WWW/CGI.pm +3 -8

No files found.
--- a/Bugzilla/Auth/Login/WWW/CGI.pm
+++ b/Bugzilla/Auth/Login/WWW/CGI.pm
@@ -92,7 +92,6 @@ sub login {
                              -value => $userid);
            $cgi->send_cookie(-name => 'Bugzilla_logincookie',
                              -value => $logincookie);
        }
    }
    elsif ($authres == AUTH_NODATA) {
@@ -170,13 +169,7 @@ sub login {
    # The account may be disabled
    if ($authres == AUTH_DISABLED) {
-        # Clear the cookie
+        clear_browser_cookies();
-        $cgi->send_cookie(-name => 'Bugzilla_login',
-                          -expires => "Tue, 15-Sep-1998 21:49:00 GMT");
-        $cgi->send_cookie(-name => 'Bugzilla_logincookie',
-                          -expires => "Tue, 15-Sep-1998 21:49:00 GMT");
        # and throw a user error
        ThrowUserError("account_disabled",
                       {'disabled_reason' => $extra});
@@ -233,8 +226,10 @@ sub logout {
 sub clear_browser_cookies {
    my $cgi = Bugzilla->cgi;
    $cgi->send_cookie(-name => "Bugzilla_login",
+                      -value => "",
                      -expires => "Tue, 15-Sep-1998 21:49:00 GMT");
    $cgi->send_cookie(-name => "Bugzilla_logincookie",
+                      -value => "",
                      -expires => "Tue, 15-Sep-1998 21:49:00 GMT");
 }