From 37722eca39874bb6abdcd120e3e458bd62dea62b Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Wed, 5 Jul 2017 11:43:18 -0700 Subject: Bug 1377933 - Remove trailing whitespace from all perl files --- Bugzilla/Auth/Login/CGI.pm | 2 +- Bugzilla/Auth/Login/Cookie.pm | 4 ++-- Bugzilla/Auth/Login/Env.pm | 2 +- Bugzilla/Auth/Login/Stack.pm | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Bugzilla/Auth/Login') diff --git a/Bugzilla/Auth/Login/CGI.pm b/Bugzilla/Auth/Login/CGI.pm index dad6ddb7c..22a765f61 100644 --- a/Bugzilla/Auth/Login/CGI.pm +++ b/Bugzilla/Auth/Login/CGI.pm @@ -77,7 +77,7 @@ sub fail_nodata { print $cgi->header(); $template->process("account/auth/login.html.tmpl", - { 'target' => $cgi->url(-relative=>1) }) + { 'target' => $cgi->url(-relative=>1) }) || ThrowTemplateError($template->error()); exit; } diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm index b52e3e7c1..9a94fe019 100644 --- a/Bugzilla/Auth/Login/Cookie.pm +++ b/Bugzilla/Auth/Login/Cookie.pm @@ -112,9 +112,9 @@ sub get_login_info { } } - # If we logged in successfully, then update the lastused + # If we logged in successfully, then update the lastused # time on the login cookie - $dbh->do("UPDATE logincookies SET lastused = NOW() + $dbh->do("UPDATE logincookies SET lastused = NOW() WHERE cookie = ?", undef, $login_cookie); return { user_id => $user_id }; } diff --git a/Bugzilla/Auth/Login/Env.pm b/Bugzilla/Auth/Login/Env.pm index 9d3da183f..a4de8c638 100644 --- a/Bugzilla/Auth/Login/Env.pm +++ b/Bugzilla/Auth/Login/Env.pm @@ -33,7 +33,7 @@ sub get_login_info { return { failure => AUTH_NODATA } if !$env_email; - return { username => $env_email, extern_id => $env_id, + return { username => $env_email, extern_id => $env_id, realname => $env_realname }; } diff --git a/Bugzilla/Auth/Login/Stack.pm b/Bugzilla/Auth/Login/Stack.pm index dc35998e4..d44ebbd46 100644 --- a/Bugzilla/Auth/Login/Stack.pm +++ b/Bugzilla/Auth/Login/Stack.pm @@ -51,12 +51,12 @@ sub get_login_info { } $result = $object->get_login_info(@_); $self->{successful} = $object; - + # We only carry on down the stack if this method denied all knowledge. last unless ($result->{failure} - && ($result->{failure} eq AUTH_NODATA + && ($result->{failure} eq AUTH_NODATA || $result->{failure} eq AUTH_NO_SUCH_USER)); - + # If none of the methods succeed, it's undef. $self->{successful} = undef; } -- cgit v1.2.3-24-g4f1b