From ef4e3ea51a57cc8d112b809711023bbb9999f53c Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Wed, 17 Aug 2011 13:01:08 -0400 Subject: [PATCH] Assume username, not barcode, in TPAC login In the absence of a barcode regex OU setting (opac.barcode_regex), the TPAC was assuming that the entered value was a barcode. However, the default JSPAC assumption was that the entered value was a username. This commit makes the TPAC continue to function with the same assumptions as the default JSPAC in the absence of a barcode regex OU setting. Signed-off-by: Dan Scott --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm index 6412907fca..a9d0565757 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm @@ -288,15 +288,15 @@ sub load_login { 'open-ils.auth.authenticate.init', $username); my $args = { - barcode => $username, + username => $username, password => md5_hex($seed . md5_hex($password)), type => ($persist) ? 'persist' : 'opac' }; my $bc_regex = $ctx->{get_org_setting}->($org_unit, 'opac.barcode_regex'); - $args->{username} = delete $args->{barcode} - if $bc_regex and !($username =~ /$bc_regex/); + $args->{barcode} = delete $args->{username} + if $bc_regex and ($username =~ /$bc_regex/); my $response = $U->simplereq( 'open-ils.auth', 'open-ils.auth.authenticate.complete', $args); -- 2.43.2