Bugzilla – Attachment 23199 Details for
Bug 11077
Correct silent warnings in C4/Auth.pm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11077 - Correct silent warnings in C4/Auth.pm
Bug-11077---Correct-silent-warnings-in-C4Authpm.patch (text/plain), 3.71 KB, created by
Marcel de Rooy
on 2013-11-27 17:28:42 UTC
(
hide
)
Description:
Bug 11077 - Correct silent warnings in C4/Auth.pm
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2013-11-27 17:28:42 UTC
Size:
3.71 KB
patch
obsolete
>From 42ebc709b14a746daaf8f54e7624f664afcad088 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Fri, 1 Nov 2013 09:51:28 -0400 >Subject: [PATCH] Bug 11077 - Correct silent warnings in C4/Auth.pm >Content-Type: text/plain; charset=utf-8 > >This patch corrects a noisy ne condition. > $userid = $retuserid if ( $retuserid ne ''); >became > $userid = $retuserid if ( $retuserid ); > >It also integrates Srdjan Jankovic's patch with Petter Goksoyrsen's >patch, while correcting the problems found. > >This includes: > my $q_userid = $query->param('userid') // ''; >along with: > my $s_userid = ''; >and: > my $s_userid = $session->param('id') // ''; >Indentation does not reflect actual scoping. > >And the 'None' is changed to '', since that behaves properly >in the undef case: > my $pki_field = C4::Context->preference('AllowPKIAuth') // ''; >--- > C4/Auth.pm | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 9d0b623..790f56c 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -650,7 +650,7 @@ sub checkauth { > # This parameter is the name of the CAS server we want to authenticate against, > # when using authentication against multiple CAS servers, as configured in Auth_cas_servers.yaml > my $casparam = $query->param('cas'); >- my $q_userid = $query->param('userid'); >+ my $q_userid = $query->param('userid') // ''; > > if ( $userid = $ENV{'REMOTE_USER'} ) { > # Using Basic Authentication, no cookies required >@@ -670,9 +670,9 @@ sub checkauth { > my $session = get_session($sessionID); > C4::Context->_new_userenv($sessionID); > my ($ip, $lasttime, $sessiontype); >- my $s_userid; >+ my $s_userid = ''; > if ($session){ >- $s_userid = $session->param('id'); >+ $s_userid = $session->param('id') // ''; > C4::Context::set_userenv( > $session->param('number'), $s_userid, > $session->param('cardnumber'), $session->param('firstname'), >@@ -690,7 +690,7 @@ sub checkauth { > $userid = $s_userid; > $sessiontype = $session->param('sessiontype') || ''; > } >- if ( ( $query->param('koha_login_context') && ($q_userid && $s_userid && $q_userid ne $s_userid) ) >+ if ( ( $query->param('koha_login_context') && ($q_userid ne $s_userid) ) > || ( $cas && $query->param('ticket') ) ) { > #if a user enters an id ne to the id in the current session, we need to log them in... > #first we need to clear the anonymous session... >@@ -714,7 +714,7 @@ sub checkauth { > logout_cas($query); > } > } >- elsif ( $lasttime && ($lasttime < time() - $timeout) ) { >+ elsif ( !$lasttime || ($lasttime < time() - $timeout) ) { > # timed logout > $info{'timed_out'} = 1; > $session->delete() if $session; >@@ -763,7 +763,7 @@ sub checkauth { > -HttpOnly => 1 > ); > $userid = $q_userid; >- my $pki_field = C4::Context->preference('AllowPKIAuth') // 'None'; >+ my $pki_field = C4::Context->preference('AllowPKIAuth') // ''; > if ( ( $cas && $query->param('ticket') ) > || $userid > || $pki_field ne 'None' >@@ -838,7 +838,7 @@ sub checkauth { > my $retuserid; > ( $return, $cardnumber, $retuserid ) = > checkpw( $dbh, $userid, $password, $query ); >- $userid = $retuserid if ( $retuserid ne '' ); >+ $userid = $retuserid if ( $retuserid ); > } > if ($return) { > #_session_log(sprintf "%20s from %16s logged in at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime)); >-- >1.7.7.6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11077
:
22042
|
22043
|
22120
|
22125
|
22665
|
22667
|
22805
|
22806
|
22831
|
22844
|
22854
|
23197
|
23198
|
23199
|
23214
|
23215
|
23217
|
23218
|
23219
|
23240
|
23268
|
23288