@@ -, +, @@ - OPACShibOnly = "Don't allow" - AutoSelfCheckAllowed = Allow - AutoSelfCheckID and AutoSelfCheckPass = The username and password of a - SelfCheckoutByLogin = 'cardnumber' --- C4/Auth.pm | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -1137,7 +1137,7 @@ sub checkauth { ( ( $type eq 'opac' ) && C4::Context->preference('OPACShibOnly') - && C4::Context->preference('SelfCheckoutByLogin') ne 'shibboleth' + && !$query->param('sco_user_login') ) || ( ( $type ne 'opac' ) && C4::Context->preference('staffShibOnly') ) @@ -1457,7 +1457,7 @@ sub checkauth { if ($shib) { #If shibOnly is enabled just go ahead and redirect directly - if ( (($type eq 'opac') && C4::Context->preference('OPACShibOnly')) || (($type ne 'opac') && C4::Context->preference('staffShibOnly')) ) { + if ( (($type eq 'opac') && C4::Context->preference('OPACShibOnly') && !$query->param('sco_user_login') ) || (($type ne 'opac') && C4::Context->preference('staffShibOnly')) ) { my $redirect_url = login_shib_url( $query ); print $query->redirect( -uri => "$redirect_url", -status => 303 ); safe_exit; --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -404,7 +404,7 @@
- [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %] + [% IF ( Koha.Preference('SelfCheckoutByLogin') == 'username' ) %] Log in to your account @@ -413,7 +413,7 @@
- [% ELSE %] + [% ELSIF ( Koha.Preference('SelfCheckoutByLogin') == 'cardnumber' ) %]
--